Oops, really unify, and also fix SubprocessError to consume the stderr stream.

[flac-archive] / rewrite-tags

diff --git a/rewrite-tags b/rewrite-tags
index d4ce48c7ef22742edbef57f234e9a5a9e01ffd05..a3b5eb6af818210f405dc5cfba11bea44148cd48 100755 (executable)
--- a/rewrite-tags
+++ b/rewrite-tags
@@ -20,7 +20,7 @@ class SubprocessError(Exception):
         Exception.__init__(self, msg % (abs(status), command_msg))
         self.status = status
         self.command = command
-        self.stderr = stderr
+        self.stderr = ''.join(stderr)
 
 def get_tags(fn):
     tags = Tags()
@@ -43,10 +43,9 @@ def rewrite_track_tags(track, tags, fn, tmp):
                '--remove-all-tags', '--import-tags-from', tmp.name, fn]
     p = subprocess.Popen(command, stdout=subprocess.PIPE,
                          stderr=subprocess.STDOUT)
-    stdout, stderr = p.communicate()
     status = p.wait()
     if status != 0:
-        raise SubprocessError(status, command=command, stderr=stdout)
+        raise SubprocessError(status, command=command, stderr=p.stdout)
 
 def do_read(filenames):
     # Use this mapping of tag names to sets of tag values to detect global tags.