summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2015-07-22 17:23:29 -0700
committerDylan Baker <baker.dylan.c@gmail.com>2015-07-23 11:43:34 -0700
commitc1167cc23bbc257623baa942a5f3a13c681f86b6 (patch)
tree9e225b9aedcbf76c134167a4ac70b8f9e0f8cf91
parent0c0b125eda62dea434284e49373ec1a90deba01a (diff)
framework: hide stderr messages from xz binary
When compressing, if there is an error it will be caught and handled by the framework, with a nice error message. Don't allow xz to spam stderr as well. Signed-off-by: Dylan Baker <dylanx.c.baker@intel.com> Tested-by: Michel Dänzer <michel.daenzer@amd.com>
-rw-r--r--framework/backends/compression.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/framework/backends/compression.py b/framework/backends/compression.py
index b26c4d77a..6f867beb5 100644
--- a/framework/backends/compression.py
+++ b/framework/backends/compression.py
@@ -125,7 +125,10 @@ except ImportError:
yield f
try:
- subprocess.check_call(['xz', '--compress', '-9', filename])
+ with open(os.devnull, 'w') as null:
+ subprocess.check_call(
+ ['xz', '--compress', '-9', filename],
+ stderr=null)
except OSError as e:
if e.errno == errno.ENOENT:
raise exceptions.PiglitFatalError(
@@ -146,8 +149,10 @@ except ImportError:
filename = '{}.xz'.format(filename)
try:
- string = subprocess.check_output(
- ['xz', '--decompress', '--stdout', filename])
+ with open(os.devnull, 'w') as null:
+ string = subprocess.check_output(
+ ['xz', '--decompress', '--stdout', filename],
+ stderr=null)
except OSError as e:
if e.errno == errno.ENOENT:
raise exceptions.PiglitFatalError(