lsb 3.0-9 Debian release.

diff --git a/debian/changelog b/debian/changelog
index 42155d664d164e2db903e06f6980e342eb7cf51f..8b1cf88b1a9c78d93249fa09241381f59729bb7b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+lsb (3.0-9) unstable; urgency=low
+
+  * Fix silly Pythonic else in init-functions.  (Closes: #329936)
+  * s/log_action_start_msg/log_action_begin_msg/ in README.Debian.
+    (Thanks to Marco d'Itri for pointing these two out.)
+  * If bits of /etc/lsb-release are missing (but not the whole file), use
+    detected information in its place.
+
+ -- Chris Lawrence <lawrencc@debian.org>  Sat, 24 Sep 2005 19:16:00 -0400
+
 lsb (3.0-8) unstable; urgency=low
 
   * Bring in lsb-release (binary) package; rewritten to handle -v properly

diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian
index d06ccce31320f2ca578d6afe5eb1c8de596c4809..49f7f6e77eaae449805db3cf497cedc4b84305ce 100644 (file)
--- a/debian/lsb-base.README.Debian
+++ b/debian/lsb-base.README.Debian
@@ -32,7 +32,7 @@ permit simplified logging of init script actions.
     On Debian, a trailing period will be added to the message,
     followed by a newline.
 
-  - log_action_start_msg "Configuring network interfaces"
+  - log_action_begin_msg "Configuring network interfaces"
 
     Log the start of an action that is expected to take some time.  On
     Debian, an elipsis (...) will follow the message, and the cursor will
@@ -90,4 +90,4 @@ If supplied, this script fragment should be compatible with any Debian
 /bin/sh, as init scripts sourcing this file may be running under any
 Bourne-style shell permitted by Debian policy (i.e. not just bash).
 
- -- Chris Lawrence <lawrencc@debian.org>, Wed Sep 21 20:21:36 2005
+ -- Chris Lawrence <lawrencc@debian.org>, Sat Sep 24 19:15:02 2005

diff --git a/init-functions b/init-functions
index 31579275fd7ac73894b124bb1152189a670aab97..2a138e738419acb32f382288de5b13bcc047c74c 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -1,6 +1,6 @@
 # /lib/lsb/init-functions for Debian -*- shell-script -*-
 #
-#Copyright (c) 2002-03 Chris Lawrence
+#Copyright (c) 2002-05 Chris Lawrence
 #All rights reserved.
 #
 #Redistribution and use in source and binary forms, with or without
@@ -279,7 +279,7 @@ log_action_end_msg () {
             RED=`$TPUT setaf 1`
             NORMAL=`$TPUT op`
             /bin/echo -e "${RED}failed${end}${NORMAL}"
-        else:
+        else
             echo "failed${end}"
         fi
     fi

diff --git a/lsb_release b/lsb_release
index d639d603e65f6d25f49d8ac44edf4188462ddb0e..7cf2cd96bd289ccf89ca03139497777a3c19cf30 100755 (executable)
--- a/lsb_release
+++ b/lsb_release
@@ -85,6 +85,8 @@ def guess_debian_release():
         distinfo['OS'] = 'GNU/'+kern
     elif kern == 'FreeBSD':
         distinfo['OS'] = 'GNU/k'+kern
+    else:
+        distinfo['OS'] = 'GNU'
 
     if os.path.exists('/etc/debian_version'):
         release = open('/etc/debian_version').read().strip()
@@ -94,13 +96,15 @@ def guess_debian_release():
             distinfo.update({ 'RELEASE' : release, 'CODENAME' : codename })
         else:
             # Guess with apt policy before being this stupid?
-            distinfo.update({ 'RELEASE' : release, 'CODENAME' : 'sid'} )
+            distinfo.update({ 'RELEASE' : release, 'CODENAME' : 'sid'})
 
     distinfo['DESCRIPTION'] = '%(ID)s %(OS)s %(RELEASE)s (%(CODENAME)s)' % distinfo
     return distinfo
 
 def get_distro_information():
-    distinfo = {}
+    distinfo = guess_debian_release()
+
+    # Replace any info in /etc/lsb-release
     if os.path.exists('/etc/lsb-release'):
         for line in open('/etc/lsb-release'):
             line = line.strip()
@@ -112,8 +116,6 @@ def get_distro_information():
                 if arg.startswith('"') and arg.endswith('"'):
                     arg = arg[1:-1]
                 distinfo[var] = arg
-    else:
-        distinfo = guess_debian_release()
 
     return distinfo