diff options
Diffstat (limited to 'openstack')
| -rw-r--r-- | openstack/common/setup.py | 8 | ||||
| -rw-r--r-- | openstack/common/threadgroup.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index 83eef07..e6f72f0 100644 --- a/openstack/common/setup.py +++ b/openstack/common/setup.py @@ -117,8 +117,12 @@ def write_requirements(): def _run_shell_command(cmd): - output = subprocess.Popen(["/bin/sh", "-c", cmd], - stdout=subprocess.PIPE) + if os.name == 'nt': + output = subprocess.Popen(["cmd.exe", "/C", cmd], + stdout=subprocess.PIPE) + else: + output = subprocess.Popen(["/bin/sh", "-c", cmd], + stdout=subprocess.PIPE) out = output.communicate() if len(out) == 0: return None diff --git a/openstack/common/threadgroup.py b/openstack/common/threadgroup.py index 9d2f0b6..f501889 100644 --- a/openstack/common/threadgroup.py +++ b/openstack/common/threadgroup.py @@ -53,7 +53,7 @@ class Thread(object): return self.thread.wait() -class ThreadGroup(): +class ThreadGroup(object): """ The point of this class is to: - keep track of timers and greenthreads (making it easier to stop them |