From 8e43b9717c9a3fac1dbce315c61f6b38c591f1c8 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 19 Oct 2020 06:50:24 +0000 Subject: [PATCH] systemvm: fix proc.find in CsProcess.py --- systemvm/debian/opt/cloud/bin/cs/CsApp.py | 1 - systemvm/debian/opt/cloud/bin/cs/CsProcess.py | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/systemvm/debian/opt/cloud/bin/cs/CsApp.py b/systemvm/debian/opt/cloud/bin/cs/CsApp.py index 9f3375f7980e..a2292ae30693 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsApp.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsApp.py @@ -17,7 +17,6 @@ # under the License. import os from CsFile import CsFile -from CsProcess import CsProcess import CsHelper diff --git a/systemvm/debian/opt/cloud/bin/cs/CsProcess.py b/systemvm/debian/opt/cloud/bin/cs/CsProcess.py index c3a42e5a8b32..4a64807c86f6 100755 --- a/systemvm/debian/opt/cloud/bin/cs/CsProcess.py +++ b/systemvm/debian/opt/cloud/bin/cs/CsProcess.py @@ -40,9 +40,9 @@ def kill_all(self): def find_pid(self): self.pid = [] + items = len(self.search) for i in CsHelper.execute("ps aux"): - items = len(self.search) - proc = re.split(r"\s+", i)[items*-1:] + proc = re.split(r"\s+", i)[10:] matches = len([m for m in proc if m in self.search]) if matches == items: self.pid.append(re.split(r"\s+", i)[1])