Merge branch '4.14'

This commit is contained in:
Daan Hoogland 2020-10-24 12:55:25 +02:00
commit ee5094b77f
2 changed files with 2 additions and 3 deletions

View File

@ -17,7 +17,6 @@
# under the License.
import os
from CsFile import CsFile
from CsProcess import CsProcess
import CsHelper

View File

@ -40,9 +40,9 @@ class CsProcess(object):
def find_pid(self):
self.pid = []
for i in CsHelper.execute("ps aux"):
items = len(self.search)
proc = re.split(r"\s+", i)[items*-1:]
for i in CsHelper.execute("ps aux"):
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])