Package: lsb-release
Version: 3.2-20
Severity: normal
Tags: patch

lsb_release currently hard-codes the testing ditribution name.
This patch overrides the hard-coding where the results from /etc/debian-version
appear to contain a valid name. If the results from debian-version contain a 
numeric identifier then the number is used, as in current processing. If the 
results
are "testing" meaning that debian-version hasn't defined a name I return a 
result
of "unknown.new.testing" on the premise that base-files wouldn't set "testing".

Simple enough patch, works with the current (new) base-files. The "global" is 
required
otherwise an error is generated when the if fails


--------------start patch--------------------------------
--- /old/lsb_release    2008-07-24 15:03:03.000000000 -0400
+++ /new/lsb_release    2009-02-28 13:30:34.920760245 -0500
@@ -39,7 +39,7 @@
     '5.0' : 'lenny',
     }
 
-TESTING_CODENAME = 'lenny'
+TESTING_CODENAME = 'unkown.new.testing'
 
 def lookup_codename(release, unknown=None):
     m = re.match(r'(\d+)\.(\d+)(r(\d+))?', release)
@@ -188,6 +188,9 @@
             codename = lookup_codename(release, 'n/a')
             distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename })
         elif release.endswith('/sid'):
+            if release.rstrip('/sid').lower().isalpha() != 'testing':
+                global TESTING_CODENAME
+                TESTING_CODENAME = release.rstrip('/sid')
             distinfo['RELEASE'] = 'testing/unstable'
         else:
             distinfo['RELEASE'] = release
--------------end patch--------------------------------



-- Package-specific info:
lsb_release output
-*- -*- -*- -*- -*-
Distributor ID: Debian
Description:    Debian GNU/Linux testing (lenny)
Release:        testing
Codename:       lenny
-*- -*- -*- -*- -*-
    Apt policy
-*- -*- -*- -*- -*-
Package files:
 100 /var/lib/dpkg/status
     release a=now
   1 http://debian.mirror.frontiernet.net stable/non-free Packages
     release v=5.0,o=Debian,a=stable,l=Debian,c=non-free
     origin debian.mirror.frontiernet.net
   1 http://debian.mirror.frontiernet.net stable/contrib Packages
     release v=5.0,o=Debian,a=stable,l=Debian,c=contrib
     origin debian.mirror.frontiernet.net
   1 http://debian.mirror.frontiernet.net stable/main Packages
     release v=5.0,o=Debian,a=stable,l=Debian,c=main
     origin debian.mirror.frontiernet.net
   1 http://debian.mirror.frontiernet.net experimental/non-free Packages
     release o=Debian,a=experimental,l=Debian,c=non-free
     origin debian.mirror.frontiernet.net
   1 http://debian.mirror.frontiernet.net experimental/contrib Packages
     release o=Debian,a=experimental,l=Debian,c=contrib
     origin debian.mirror.frontiernet.net
   1 http://debian.mirror.frontiernet.net experimental/main Packages
     release o=Debian,a=experimental,l=Debian,c=main
     origin debian.mirror.frontiernet.net
 100 http://debian.mirror.frontiernet.net sid/contrib Packages
     release o=Debian,a=unstable,l=Debian,c=contrib
     origin debian.mirror.frontiernet.net
 100 http://debian.mirror.frontiernet.net sid/non-free Packages
     release o=Debian,a=unstable,l=Debian,c=non-free
     origin debian.mirror.frontiernet.net
 100 http://debian.mirror.frontiernet.net sid/main Packages
     release o=Debian,a=unstable,l=Debian,c=main
     origin debian.mirror.frontiernet.net
 990 http://debian.mirror.frontiernet.net testing/contrib Packages
     release o=Debian,a=testing,l=Debian,c=contrib
     origin debian.mirror.frontiernet.net
 990 http://debian.mirror.frontiernet.net testing/non-free Packages
     release o=Debian,a=testing,l=Debian,c=non-free
     origin debian.mirror.frontiernet.net
 990 http://debian.mirror.frontiernet.net testing/main Packages
     release o=Debian,a=testing,l=Debian,c=main
     origin debian.mirror.frontiernet.net
Pinned packages:
-*- -*- -*- -*- -*-
   sources.list
-*- -*- -*- -*- -*-
deb http://debian.mirror.frontiernet.net/debian/ testing main non-free contrib
deb http://debian.mirror.frontiernet.net/debian/ sid main non-free contrib
deb http://debian.mirror.frontiernet.net/debian/ experimental main contrib 
non-free
deb http://debian.mirror.frontiernet.net/debian/ stable main contrib non-free
deb-src http://debian.mirror.frontiernet.net/debian/ testing main non-free 
contrib
deb-src http://debian.mirror.frontiernet.net/debian/ sid main non-free contrib
deb-src http://debian.mirror.frontiernet.net/debian/ experimental main contrib 
non-free
deb-src http://security.debian.org/ testing/updates main contrib non-free
deb-src http://volatile.debian.org/debian-volatile lenny/volatile main contrib 
non-free
-*- -*- -*- -*- -*-
 /etc/lsb_release
-*- -*- -*- -*- -*-
- none

-- System Information:
Debian Release: squeeze/sid
  APT prefers testing
  APT policy: (990, 'testing'), (100, 'unstable'), (1, 'experimental'), (1, 
'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.28.7+00.fbcondecor (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages lsb-release depends on:
ii  python                        2.5.2-3    An interactive high-level object-o

Versions of packages lsb-release recommends:
ii  apt                           0.7.20.2   Advanced front-end for dpkg

Versions of packages lsb-release suggests:
pn  lsb                           <none>     (no description available)

-- no debconf information



-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to