summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-03 12:08:57 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-06-03 12:08:57 +0000
commit9238abc2972b796eacc84e2767d4548664495d97 (patch)
treec3b2f1380ce7ba34fdf9f5b9b407019601a5b0b2
parentd19dd18bf759fc1aa1337d2053d991977adc7e07 (diff)
parent70f2caa773fc5f0e2b1154a5c095665375f02666 (diff)
Merge "Upstream: p/common.py: catch stderr in exec_cmd."
-rw-r--r--patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch b/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
deleted file mode 100644
index 918a1192..00000000
--- a/patches/opnfv-fuel/0011-common.py-catch-stderr-in-exec_cmd.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Josep Puigdemont <josep.puigdemont@enea.com>
-Date: Wed, 4 May 2016 14:27:23 +0200
-Subject: [PATCH] common.py: catch stderr in exec_cmd
-
-Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
----
- deploy/common.py | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/deploy/common.py b/deploy/common.py
-index 787a21a..41b4e27 100644
---- 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)