lsb 3.2-8 Debian release.

diff --git a/debian/changelog b/debian/changelog
index c9697f6d29beec54b56a7eb4f43f2d02f6a074b1..8213b060f31a135f740568f31a1222998d14744a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+lsb (3.2-8) unstable; urgency=medium
+
+  * Bump conflicts to python < 2.6.  (Closes: #475953)
+  * init-functions: In killproc(), return 0 if program is not running
+    (instead of 3).  (Closes: #475258)
+  * lsb_release: Due to popular demand, report pinned release rather than
+    "unstable" on systems with multiple releases in sources.list.
+    (Closes: #459257)
+
+ -- Chris Lawrence <lawrencc@debian.org>  Mon, 14 Apr 2008 01:00:50 -0500
+
 lsb (3.2-7) unstable; urgency=low
 
   * Remove libstdc++5 dependency on all architectures, since it's only

diff --git a/debian/control b/debian/control
index d142249090f4065b345462581c0e3fcc584b3d11..c5fe88f4a6678f5fb62aee86543e6f8528f45be7 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: lsb-core
 Architecture: any
 Depends: lsb-release, ${glibc}, libz1, libncurses5, libpam0g, exim4 | mail-transport-agent, at, bc, binutils, bsdmainutils, bsdutils, cpio, cron, ed, file, libc6-dev | libc-dev, locales, lpr, lprng | cupsys-client, m4, mailx | mailutils, make, man-db, mawk | gawk, ncurses-term, passwd, patch, pax, procps, psmisc, rsync, alien (>= 8.36), ${python:Depends}, ${misc:Depends}, ${depends}, lsb-base
 Provides: lsb-core-noarch, ${provides}
-Conflicts: python (>> 2.5), lsb (<< 2.0-2)
+Conflicts: python (>> 2.6), lsb (<< 2.0-2)
 Replaces: lsb (<< 2.0-2)
 XB-Python-Version: ${python:Versions}
 Description: Linux Standard Base 3.2 core support package

diff --git a/init-functions b/init-functions
index 3b72d75432c1316f4f469d8e273582f506bd00e2..aa41e249f0fbeec5af5d905f9ca5a5b795ffa686 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -1,6 +1,6 @@
 # /lib/lsb/init-functions for Debian -*- shell-script -*-
 #
-#Copyright (c) 2002-06 Chris Lawrence
+#Copyright (c) 2002-08 Chris Lawrence
 #All rights reserved.
 #
 #Redistribution and use in source and binary forms, with or without
@@ -137,7 +137,7 @@ killproc () {
         if [ -n "$sig" ]; then
             return 0
         fi
-        return 3 # program is not running
+        return 0 # program is not running
     fi
 
     if [ "$status" = 0 -a "$is_term_sig" = yes ]; then

diff --git a/lsb_release b/lsb_release
index 9dddcedff0c45f800a3e0874c49a492d8fd13994..a128888107c58fd82ade0d6aab59aa4ba070827a 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -142,48 +142,26 @@ def parse_apt_policy():
     return data
 
 def guess_release_from_apt(origin='Debian', component='main',
-                           ignoresuites=('experimental')):
+                           ignoresuites=('experimental'),
+                           label='Debian'):
     releases = parse_apt_policy()
 
     if not releases:
         return None
 
-    # We only care about the specified origin and component
+    # We only care about the specified origin, component, and label
     releases = [x for x in releases if (
         x[1].get('origin', '') == origin and
-        x[1].get('component', '') == component)]
+        x[1].get('component', '') == component and
+        x[1].get('label', '') == label)]
     
     releases.sort()
     releases.reverse()
 
-    # If the user has multiple releases we should
-    # only return the 'newest'.
-
-    # Unstable is always the 'newest'
-    for (pri, rinfo) in releases:
-        if rinfo.get('suite', '') == 'unstable':
-            return rinfo
-    # After it goes testing
-    for (pri, rinfo) in releases:
-        if rinfo.get('suite', '') == 'testing':
-            return rinfo
-
-    # Finally, find the highest numeric value
-    highestrelease = 0
-    for (pri, rinfo) in releases:
-        if rinfo.get('suite', '') not in ignoresuites:
-            version = RELEASE_CODENAME_LOOKUP.get(unknown, rinfo.get('suite',''))
-            if version > highestrelease:
-                highestrelease = version
-
-    # And return it
-    for (pri, rinfo) in releases:
-        if rinfo.get('suite', '') not in ignoresuites:
-            version = RELEASE_CODENAME_LOOKUP.get(unknown, rinfo.get('suite',''))
-            if version == highestrelease:
-                return rinfo
-
-    return None
+    # We've sorted the list by descending priority, so the first entry should
+    # be the "main" release in use on the system
+
+    return releases[0][1]
 
 def guess_debian_release():
     distinfo = {'ID' : 'Debian'}