X Strike Force XFree86 SVN commit: rev 638 - trunk/debian
Author: branden
Date: 2003-10-08 23:18:14 -0500 (Wed, 08 Oct 2003)
New Revision: 638
Modified:
trunk/debian/changelog
trunk/debian/xbase-clients.preinst.in
Log:
Quote readlink subshell command in xbase-clients pre-installation script
so that the test command doesn't fail in the case where readlink returns
nothing. (Closes: #214804)
- debian/xbase-clients.preinst.in
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2003-10-09 04:13:58 UTC (rev 637)
+++ trunk/debian/changelog 2003-10-09 04:18:14 UTC (rev 638)
@@ -32,8 +32,13 @@
* Shell style cleanup: use integer (not string) comparisons on $?.
- debian/xserver-common.config.in
- -- Branden Robinson <branden@debian.org> Wed, 8 Oct 2003 23:12:15 -0500
+ * Quote readlink subshell command in xbase-clients pre-installation script
+ so that the test command doesn't fail in the case where readlink returns
+ nothing. (Closes: #214804)
+ - debian/xbase-clients.preinst.in
+ -- Branden Robinson <branden@debian.org> Wed, 8 Oct 2003 23:16:00 -0500
+
xfree86 (4.2.1-12.1) unstable; urgency=low
* Fix typo in xlibs preinst. Closes: #213774, #213776
Modified: trunk/debian/xbase-clients.preinst.in
===================================================================
--- trunk/debian/xbase-clients.preinst.in 2003-10-09 04:13:58 UTC (rev 637)
+++ trunk/debian/xbase-clients.preinst.in 2003-10-09 04:18:14 UTC (rev 638)
@@ -35,7 +35,8 @@
# workaround for dpkg craziness (#28519)
if dpkg --compare-versions "$2" lt "3.3.2.3a-1"; then
- if [ -L /etc/X11/xinit/xinitrc -a $(readlink /etc/X11/xinitrc) = "../Xsession" ]; then
+ if [ -L /etc/X11/xinit/xinitrc \
+ -a "$(readlink /etc/X11/xinitrc)" = "../Xsession" ]; then
message "Note: Removing obsolete symbolic link /etc/X11/xinit/xinitrc."
rm /etc/X11/xinit/xinitrc
fi
Reply to: