X Strike Force SVN commit: rev 453 - trunk/debian
Author: branden
Date: 2003-08-28 10:46:55 -0500 (Thu, 28 Aug 2003)
New Revision: 453
Modified:
trunk/debian/xserver-xfree86.preinst.in
Log:
debian/xserver-xfree86.preinst.in: whee! another subtle logic error!
test -e tests the existence of a symlink *target* if its argument is a
symlink, so when installing the package fresh, ensure that both ! -e and
! -L are true before attempting to create the default server symlink;
this ensures that we can install xserver-xfree86* over a previous
removed-but-not-purged installation of xserver-xfree86*
Modified: trunk/debian/xserver-xfree86.preinst.in
===================================================================
--- trunk/debian/xserver-xfree86.preinst.in 2003-08-28 07:36:42 UTC (rev 452)
+++ trunk/debian/xserver-xfree86.preinst.in 2003-08-28 15:46:55 UTC (rev 453)
@@ -36,8 +36,9 @@
if [ "$1" = "install" ]; then
# only proceed if config file auxiliary directory exists
if [ -d "$CONFIG_AUX_DIR" ]; then
- # first, create and checksum the X server symlink
- if [ ! -e "$SERVER_SYMLINK" ]; then
+ # first, create and checksum the X server symlink; only do this if it
+ # both does not exist and is not a symbolic link
+ if [ ! -e "$SERVER_SYMLINK" -a ! -L "$SERVER_SYMLINK" ]; then
# $THIS_SERVER is just a default; could as easily be /bin/true
ln -s "$THIS_SERVER" "$SERVER_SYMLINK"
readlink "$SERVER_SYMLINK" | md5sum > "$SERVER_SYMLINK_CHECKSUM"
Reply to: