r24305 - in /desktop/unstable/gdm/debian: changelog gdm.config

[joss at users.alioth.debian.org]

Author: joss
Date: Fri May  7 21:21:11 2010
New Revision: 24305

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24305
Log:
gdm.config: handle the case where $OLD_DAEMON is empty.
Closes: #579103.

Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/gdm.config

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=24305&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm/debian/changelog [utf-8] Fri May  7 21:21:11 2010
@@ -1,3 +1,10 @@
+gdm (2.20.10-4) UNRELEASED; urgency=low
+
+  * gdm.config: handle the case where $OLD_DAEMON is empty.
+    Closes: #579103.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 07 May 2010 23:20:46 +0200
+
 gdm (2.20.10-3) unstable; urgency=low
 
   * gdm.config: add missing $ leading to a dpkg-tmp file being created 

Modified: desktop/unstable/gdm/debian/gdm.config
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/gdm.config?rev=24305&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/gdm.config [utf-8] (original)
+++ desktop/unstable/gdm/debian/gdm.config [utf-8] Fri May  7 21:21:11 2010
@@ -32,7 +32,7 @@
   OLD_DAEMON="$(grep -v '^[[:space:]]*#' \
                             "$DEFAULT_DISPLAY_MANAGER_FILE" |
                             head -n 1)"
-  OLD_DEFAULT="$(basename $OLD_DAEMON)"
+  OLD_DEFAULT="$(basename $OLD_DAEMON 2>/dev/null || true)"
   if [ -n "$OLD_DEFAULT" ]; then
     db_set shared/default-x-display-manager "$OLD_DEFAULT"
   fi