lsb 3.2-10 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 07ad19b525fb522c41dd998de212d67954619fc6..b03f5446af61e458f227e0fa81dbaacf874573b1 100644 (file)
--- 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 <lawrencc@debian.org>  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 12b35822b34586cb526ef168cd3d81c02263e999..b4cd20d9795843372ab12cb1bfa2b870cd57bb92 100755 (executable)
--- 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')