From 33a8850f6463f6b96e03c475d37aaccb2a834129 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Mon, 30 Jul 2012 13:28:19 +0200 Subject: apt/auth.py: Forward stderr from apt-key to our stderr if non-empty --- apt/auth.py | 4 ++++ debian/changelog | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apt/auth.py b/apt/auth.py index c52ec3a6..e088ae85 100644 --- a/apt/auth.py +++ b/apt/auth.py @@ -28,6 +28,7 @@ import atexit import os import os.path import subprocess +import sys import tempfile import apt_pkg @@ -83,6 +84,9 @@ def _call_apt_key_script(*args, **kwargs): "stdout: %s\n" "stderr: %s" % (proc.returncode, " ".join(cmd), output,stderr)) + elif stderr: + sys.stderr.write(stderr) # Forward stderr + return output.strip() finally: if conf is not None: diff --git a/debian/changelog b/debian/changelog index 56c20582..f908bcd1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,9 @@ python-apt (0.8.7) UNRELEASED; urgency=low * Fix typos: the the -> the (closes: #679432) [ Julian Andres Klode ] - * apt/auth.py: Do not merge stdout and stderr (Closes: #678706) + * apt/auth.py: + - Do not merge stdout and stderr (Closes: #678706) + - Forward stderr from apt-key to our stderr if non-empty -- David Prévot Sat, 30 Jun 2012 16:50:03 -0400 -- cgit v1.2.3