mirror of
https://github.com/valitydev/salt.git
synced 2024-11-06 16:45:27 +00:00
fix this better, don't use clean_proc from master.py.
This commit is contained in:
parent
b9421f7c8d
commit
6abccbc0cf
@ -18,12 +18,8 @@ import multiprocessing
|
||||
import sys
|
||||
|
||||
# Import third party libs
|
||||
try:
|
||||
import zmq
|
||||
from M2Crypto import RSA
|
||||
except ImportError:
|
||||
# Don't fail on RAET when utils may import
|
||||
pass
|
||||
import zmq
|
||||
from M2Crypto import RSA
|
||||
|
||||
# Import salt libs
|
||||
import salt.crypt
|
||||
|
@ -23,7 +23,7 @@ ensure_in_syspath('../../')
|
||||
|
||||
# Import salt libs
|
||||
import integration
|
||||
from salt.master import clean_proc
|
||||
from salt.utils.process import clean_proc
|
||||
from salt.utils import event
|
||||
|
||||
SOCK_DIR = os.path.join(integration.TMP, 'test-socks')
|
||||
|
Loading…
Reference in New Issue
Block a user