From 5d3142e5fb0d6d9389b5942ccca1d720262fb690 Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Sat, 13 Feb 2010 17:03:33 +0100 Subject: * aptsources/distro.py: - Call lsb_release with -idrc instead of --all. --- aptsources/distro.py | 4 ++-- debian/changelog | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/aptsources/distro.py b/aptsources/distro.py index ff1bed89..1e60a0ed 100644 --- a/aptsources/distro.py +++ b/aptsources/distro.py @@ -438,14 +438,14 @@ class UbuntuDistribution(Distribution): self, mirror_template="http://%s.archive.ubuntu.com/ubuntu/") def _lsb_release(): - """Call lsb_release --all and return a mapping.""" + """Call lsb_release --idrc and return a mapping.""" from subprocess import Popen, PIPE import errno result = {'Codename': 'sid', 'Distributor ID': 'Debian', 'Description': 'Debian GNU/Linux unstable (sid)', 'Release': 'unstable'} try: - out = Popen(['lsb_release', '--all'], stdout=PIPE).communicate()[0] + out = Popen(['lsb_release', '-idrc'], stdout=PIPE).communicate()[0] # Convert to unicode string, needed for Python 3.1 out = out.decode("utf-8") result.update(l.split(":\t") for l in out.split("\n") if ':\t' in l) diff --git a/debian/changelog b/debian/changelog index 57a42c60..e076d029 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ python-apt (0.7.93.2) UNRELEASED; urgency=low - Implement the iterator protocol in TagFile. * data/templates/Debian.info.in: - Replace the MatchURI with one that really matches something. + * aptsources/distro.py: + - Call lsb_release with -idrc instead of --all. * tests: - Fix aptsources tests to use local data files if available. -- cgit v1.2.3