[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force XFree86 SVN commit: rev 687 - trunk/debian



Author: branden
Date: 2003-10-21 18:52:31 -0500 (Tue, 21 Oct 2003)
New Revision: 687

Modified:
   trunk/debian/changelog
   trunk/debian/xdm.config.in
Log:
In xdm's config script, move the default display manager file to a
temporary location instead of deleting it if the default is changing; this
way the change can be reverted if the install or upgrade is aborted
(already implemented in the postrm script).

- debian/xdm.config.in


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2003-10-21 23:08:21 UTC (rev 686)
+++ trunk/debian/changelog	2003-10-21 23:52:31 UTC (rev 687)
@@ -55,8 +55,14 @@
     (Closes: #216448)
     - debian/po/da.po
 
- -- Branden Robinson <branden@debian.org>  Tue, 21 Oct 2003 17:52:41 -0500
+  * In xdm's config script, move the default display manager file to a
+    temporary location instead of deleting it if the default is changing; this
+    way the change can be reverted if the install or upgrade is aborted
+    (already implemented in the postrm script).
+    - debian/xdm.config.in
 
+ -- Branden Robinson <branden@debian.org>  Tue, 21 Oct 2003 18:51:12 -0500
+
 xfree86 (4.2.1-12.1) unstable; urgency=low
 
   * Fix typo in xlibs preinst.  Closes: #213774, #213776

Modified: trunk/debian/xdm.config.in
===================================================================
--- trunk/debian/xdm.config.in	2003-10-21 23:08:21 UTC (rev 686)
+++ trunk/debian/xdm.config.in	2003-10-21 23:52:31 UTC (rev 687)
@@ -50,10 +50,13 @@
 safe_debconf db_get shared/default-x-display-manager
 NEW_DEFAULT="$RET"
 
-# remove the default display manager file if we're going to change it
+# move the default display manager file if we're going to change it
 if [ -n "$NEW_DEFAULT" ]; then
   if [ "$NEW_DEFAULT" != "$CURRENT_DEFAULT" ]; then
-    rm -f "$DEFAULT_DISPLAY_MANAGER_FILE"
+    if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
+      mv "$DEFAULT_DISPLAY_MANAGER_FILE" \
+         "$DEFAULT_DISPLAY_MANAGER_FILE.dpkg-tmp"
+    fi
   fi
 fi
 



Reply to: