Download deployment config after modification

[fuel.git] / deploy / common.py

diff --git a/deploy/common.py b/deploy/common.py
index cc418b5..41b4e27 100644 (file)
--- a/deploy/common.py
+++ b/deploy/common.py
@@ -38,20 +38,20 @@ LOG.addHandler(out_handler)
 os.chmod(LOGFILE, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
 
 def exec_cmd(cmd, check=True):
-    nul_f = open(os.devnull, 'w')
     process = subprocess.Popen(cmd,
                                stdout=subprocess.PIPE,
-                               stderr=nul_f,
+                               stderr=subprocess.PIPE,
                                shell=True)
-    nul_f.close()
-    response = process.communicate()[0].strip()
+    (response, stderr) = process.communicate()
     return_code = process.returncode
+    response = response.strip()
     if check:
         if return_code > 0:
+            stderr = stderr.strip()
             print "Failed command: " + str(cmd)
-            print "Command returned response: " + str(response)
+            print "Command returned response: " + str(stderr)
             print "Command return code: " + str(return_code)
-            raise Exception(response)
+            raise Exception(stderr)
         else:
             print "Command: " + str(cmd)
             print str(response)
@@ -133,8 +133,8 @@ def commafy(comma_separated_list):
 
 
 def check_if_root():
-    r = exec_cmd('whoami')
-    if r != 'root':
+    uid = os.getuid()
+    if uid != 0:
         err('You need be root to run this application')