Merge "Remove logic for psutil < 2.0"
This commit is contained in:
commit
f3c941cc22
@ -60,13 +60,7 @@ PHASES = ['pre-configure',
|
||||
|
||||
def timeout():
|
||||
p = psutil.Process()
|
||||
try:
|
||||
# psutils version >= 2
|
||||
children = list(p.children(recursive=True))
|
||||
except AttributeError:
|
||||
children = list(p.get_children(recursive=True))
|
||||
|
||||
for child in children:
|
||||
for child in p.children(recursive=True):
|
||||
child.kill()
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user