apt/auth.py: Do not merge stdout and stderr (Closes: #678706)

2 files changed, 8 insertions, 5 deletions

diff --git a/apt/auth.py b/apt/auth.py
index 5d4b1cd6..c52ec3a6 100644
--- a/apt/auth.py
+++ b/apt/auth.py
@@ -69,7 +69,7 @@ def _call_apt_key_script(*args, **kwargs):
         proc = subprocess.Popen(cmd, env=env, universal_newlines=True,
                                 stdin=subprocess.PIPE,
                                 stdout=subprocess.PIPE,
-                                stderr=subprocess.STDOUT)
+                                stderr=subprocess.PIPE)
 
         content = kwargs.get("stdin", None)
         if isinstance(content, unicode):
@@ -77,12 +77,12 @@ def _call_apt_key_script(*args, **kwargs):
 
         output, stderr = proc.communicate(content)
 
-        assert stderr == None
-
         if proc.returncode:
             raise SystemError("The apt-key script failed with return code %s:\n"
-                              "%s\n%s" % (proc.returncode, " ".join(cmd),
-                                          output))
+                              "%s\n"
+                              "stdout: %s\n"
+                              "stderr: %s" % (proc.returncode, " ".join(cmd),
+                                          output,stderr))
         return output.strip()
     finally:
         if conf is not None:
diff --git a/debian/changelog b/debian/changelog
index c5e03d1b..56c20582 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ python-apt (0.8.7) UNRELEASED; urgency=low
   [ Jakub Wilk ]
   * Fix typos: the the -> the (closes: #679432)
 
+  [ Julian Andres Klode ]
+  * apt/auth.py: Do not merge stdout and stderr (Closes: #678706)
+
  -- David Prévot <taffit@debian.org>  Sat, 30 Jun 2012 16:50:03 -0400
 
 python-apt (0.8.6) unstable; urgency=low