From d6ae0f5912bfe8ae2420f6108600ea699b4d5983 Mon Sep 17 00:00:00 2001 From: Chris Lawrence Date: Sun, 20 Apr 2008 09:28:20 -0500 Subject: [PATCH] lsb 3.2-10 Debian release. --- debian/changelog | 6 ++++++ lsb_release | 9 ++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 07ad19b..b03f544 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +lsb (3.2-10) unstable; urgency=low + + * Fix typo in lsb_release. (Closes: #476969) + + -- Chris Lawrence Sun, 20 Apr 2008 09:28:20 -0500 + lsb (3.2-9) unstable; urgency=low * Fix lsb_release detection when apt-cache policy identifies no Debian diff --git a/lsb_release b/lsb_release index 12b3582..b4cd20d 100755 --- a/lsb_release +++ b/lsb_release @@ -187,15 +187,10 @@ def guess_debian_release(): # /etc/debian_version should be numeric codename = lookup_codename(release, 'n/a') distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename }) - elif release.endswith('/sid') + elif release.endswith('/sid'): distinfo['RELEASE'] = 'testing/unstable' - distinfo['CODENAME'] = release - elif release.endswith('/unstable'): - distinfo['RELEASE'] = '%s/sid' % TESTING_CODENAME - distinfo['CODENAME'] = 'testing/unstable' else: distinfo['RELEASE'] = release - distinfo['CODENAME'] = None # Only use apt information if we did not get the proper information # from /etc/debian_version or if we don't have a codename @@ -206,7 +201,7 @@ def guess_debian_release(): # has an entry in his /etc/apt/sources.list but has not actually # upgraded the system. rinfo = guess_release_from_apt() - if rinfo and not distinfo['CODENAME']: + if rinfo and not distinfo.get('CODENAME'): release = rinfo.get('version') if release: codename = lookup_codename(release, 'n/a') -- 2.30.2