mirror of
https://github.com/ansible/awx.git
synced 2026-05-08 01:47:35 -02:30
Fix psutil usage on el6 for job cancel
psutil will fail to import on el6 due to not being able to access a pseudo terminal. This issues a SIGKILL to the proot process in order to force the stop
This commit is contained in:
@@ -23,6 +23,10 @@ import uuid
|
|||||||
from distutils.version import LooseVersion as Version
|
from distutils.version import LooseVersion as Version
|
||||||
import dateutil.parser
|
import dateutil.parser
|
||||||
import yaml
|
import yaml
|
||||||
|
try:
|
||||||
|
import psutil
|
||||||
|
except:
|
||||||
|
psutil = None
|
||||||
|
|
||||||
# Pexpect
|
# Pexpect
|
||||||
import pexpect
|
import pexpect
|
||||||
|
|||||||
Reference in New Issue
Block a user