Merge lp:~chipaca/python-apt/no-stderr-for-you-mister-system-image-cli into lp:~deity/python-apt/debian-sid

[John Lenton]

Discard stderr when calling system-image-cli. Avoids spurious error messages when system-image-cli is installed on a non-"Ubuntu-RTM" machine.

[Julian Andres Klode (juliank)]

Please send a git patch against the debian/sid git branch to <email address hidden>, we do not use bazaar anymore.

review: Disapprove

[John Lenton (chipaca)]

Hm, I have never done that before. I have now done so, but please let me know if it's wrong or missing something.

Thank you!

Unmerged revisions

891. By John Lenton on 2015-08-13

throw away stderr when calling system-image-cli

=== modified file 'aptsources/distro.py'
--- aptsources/distro.py	2015-08-11 17:24:41 +0000
+++ aptsources/distro.py	2015-08-13 11:00:14 +0000
@@ -484,11 +484,11 @@
 
 def _system_image_channel():
     """Get the current channel from system-image-cli -i if possible."""
-    from subprocess import Popen, PIPE
+    from subprocess import Popen, PIPE, DEVNULL
     import errno
     try:
         out = Popen(
-            ['system-image-cli', '-i'], stdout=PIPE,
+            ['system-image-cli', '-i'], stdout=PIPE, stderr=DEVNULL,
             universal_newlines=True).communicate()[0]
         for l in out.splitlines():
             if l.startswith('channel: '):