Merge branch '4.14'

Author: DaanHoogland

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
 
 

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])