diff options
Diffstat (limited to 'www/firefox/files/patch-bug1507655')
| -rw-r--r-- | www/firefox/files/patch-bug1507655 | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/www/firefox/files/patch-bug1507655 b/www/firefox/files/patch-bug1507655 index e923ec0c08e1..d0095700907b 100644 --- a/www/firefox/files/patch-bug1507655 +++ b/www/firefox/files/patch-bug1507655 @@ -4,16 +4,15 @@ diff --git build/moz.configure/util.configure build/moz.configure/util.configure index 25862fee7c32..3fc725a5124e 100644 --- build/moz.configure/util.configure +++ build/moz.configure/util.configure -@@ -22,7 +22,6 @@ +@@ -22,20 +22,13 @@ def configure_error(message): # A wrapper to obtain a process' output and return code. # Returns a tuple (retcode, stdout, stderr). -@imports('os') - @imports(_from='__builtin__', _import='unicode') @imports('subprocess') @imports(_from='mozbuild.shellutil', _import='quote') -@@ -45,13 +44,7 @@ - + @imports(_from='mozbuild.util', _import='system_encoding') + def get_cmd_output(*args, **kwargs): log.debug('Executing: `%s`', quote(*args)) proc = subprocess.Popen(args, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, @@ -25,5 +24,5 @@ index 25862fee7c32..3fc725a5124e 100644 - **kwargs) + stderr=subprocess.PIPE, **kwargs) stdout, stderr = proc.communicate() - return proc.wait(), stdout, stderr - + stdout = stdout.decode(system_encoding, 'replace') + stderr = stderr.decode(system_encoding, 'replace') |