X Strike Force X.Org X11 SVN commit: r2298 - trunk/debian/xorg/debian
Author: dnusinow
Date: 2006-06-09 00:24:21 -0400 (Fri, 09 Jun 2006)
New Revision: 2298
Modified:
trunk/debian/xorg/debian/changelog
trunk/debian/xorg/debian/x11-common.preinst.in
Log:
* During x11-common preinst, handle /usr/X11R6/bin before anything else to
try and prevent serious problems during error unwind
Modified: trunk/debian/xorg/debian/changelog
===================================================================
--- trunk/debian/xorg/debian/changelog 2006-06-09 03:18:10 UTC (rev 2297)
+++ trunk/debian/xorg/debian/changelog 2006-06-09 04:24:21 UTC (rev 2298)
@@ -5,8 +5,10 @@
* Make sure grepping for smoking guns in x11-common.postinst (or anywhere
else that the find_culprits shell function is used) no longer dies due to
a grep not returning anything. Thanks Joey Hess. (closes: #371152)
+ * During x11-common preinst, handle /usr/X11R6/bin before anything else to
+ try and prevent serious problems during error unwind
- -- David Nusinow <dnusinow@debian.org> Thu, 8 Jun 2006 22:39:31 -0400
+ -- David Nusinow <dnusinow@debian.org> Fri, 9 Jun 2006 00:23:28 -0400
xorg (1:7.0.21) unstable; urgency=low
Modified: trunk/debian/xorg/debian/x11-common.preinst.in
===================================================================
--- trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-09 03:18:10 UTC (rev 2297)
+++ trunk/debian/xorg/debian/x11-common.preinst.in 2006-06-09 04:24:21 UTC (rev 2298)
@@ -22,6 +22,17 @@
#INCLUDE_SHELL_LIB#
if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+
+ # We need to remove /usr/X11R6/bin so we can replace it with a symlink
+ if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then
+ if ! rmdir "/usr/X11R6/bin"; then
+ run db_fset x11-common/x11r6_bin_not_empty seen false
+ run db_input critical x11-common/x11r6_bin_not_empty
+ run db_go
+ exit 1
+ fi
+ fi
+
# create the configuration files' main and auxiliary directories if they
# don't exist
for DIR in "$CONFIG_DIR" "$CONFIG_AUX_DIR"; do
@@ -44,16 +55,6 @@
rm /usr/X11R6/lib/X11/fonts
fi
- # We need to remove /usr/X11R6/bin so we can replace it with a symlink
- if [ -d "/usr/X11R6/bin" ] && [ ! -L /usr/X11R6/bin ]; then
- if ! rmdir "/usr/X11R6/bin"; then
- run db_fset x11-common/x11r6_bin_not_empty seen false
- run db_input critical x11-common/x11r6_bin_not_empty
- run db_go
- exit 1
- fi
- fi
-
# migration hilarity
if [ -n "$FIRSTINST" ]; then
for i in allowed_users actual_allowed_users nice_value; do
Reply to: