From c1167cc23bbc257623baa942a5f3a13c681f86b6 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 22 Jul 2015 17:23:29 -0700 Subject: framework: hide stderr messages from xz binary MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Michel Dänzer --- framework/backends/compression.py | 11 ++++++++--- 1 file 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( -- cgit v1.2.3