|
@@ -21,6 +21,7 @@ import errno
|
|
|
import json
|
|
import json
|
|
|
import os
|
|
import os
|
|
|
import re
|
|
import re
|
|
|
|
|
+import signal
|
|
|
import ssl
|
|
import ssl
|
|
|
import subprocess
|
|
import subprocess
|
|
|
import sys
|
|
import sys
|
|
@@ -41,7 +42,6 @@ else:
|
|
|
urllib.request = urllib2
|
|
urllib.request = urllib2
|
|
|
urllib.error = urllib2
|
|
urllib.error = urllib2
|
|
|
|
|
|
|
|
-from signal import SIGTERM
|
|
|
|
|
from error import GitError, UploadError
|
|
from error import GitError, UploadError
|
|
|
import platform_utils
|
|
import platform_utils
|
|
|
from repo_trace import Trace
|
|
from repo_trace import Trace
|
|
@@ -494,7 +494,7 @@ def close_ssh():
|
|
|
|
|
|
|
|
for p in _master_processes:
|
|
for p in _master_processes:
|
|
|
try:
|
|
try:
|
|
|
- os.kill(p.pid, SIGTERM)
|
|
|
|
|
|
|
+ os.kill(p.pid, signal.SIGTERM)
|
|
|
p.wait()
|
|
p.wait()
|
|
|
except OSError:
|
|
except OSError:
|
|
|
pass
|
|
pass
|