X Strike Force XFree86 SVN commit: r1260 - trunk/debian
Author: branden
Date: 2004-04-15 15:13:01 -0500 (Thu, 15 Apr 2004)
New Revision: 1260
Modified:
trunk/debian/changelog
trunk/debian/xfs.postinst.in
Log:
Call db_stop before update-rc.d; if the latter spews to stdout, it can
confuse debconf.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-04-14 20:51:34 UTC (rev 1259)
+++ trunk/debian/changelog 2004-04-15 20:13:01 UTC (rev 1260)
@@ -151,6 +151,8 @@
stopped for upgrade, but the upgrade failed.
+ Pass package name literally to update-rc.d and invoke-rc.d; quiets
lintian warning.
+ + Call db_stop before update-rc.d; if the latter spews to stdout, it can
+ confuse debconf.
+ Use shell's && and || operators instead of test(1)'s -a and -o
operators, since the former is POSIX-compliant and the latter is not.
@@ -209,7 +211,7 @@
+ Use shell's && and || operators instead of test(1)'s -a and -o
operators, since the former is POSIX-compliant and the latter is not.
- -- Branden Robinson <branden@debian.org> Wed, 14 Apr 2004 15:49:52 -0500
+ -- Branden Robinson <branden@debian.org> Thu, 15 Apr 2004 15:11:17 -0500
xfree86 (4.3.0-7) unstable; urgency=medium
Modified: trunk/debian/xfs.postinst.in
===================================================================
--- trunk/debian/xfs.postinst.in 2004-04-14 20:51:34 UTC (rev 1259)
+++ trunk/debian/xfs.postinst.in 2004-04-15 20:13:01 UTC (rev 1260)
@@ -35,13 +35,14 @@
fi
done
+# Registering the init scripts or starting the daemon may cause output to
+# stdout, which can confuse debconf.
+db_stop
+
if [ -e /etc/init.d/xfs ]; then
update-rc.d xfs defaults
fi
-# restarting the daemon may cause output to stdout
-db_stop
-
# If we are not installing, we may or may not need to restart the daemon, but we
# always start the daemon on install.
NOSTART=
Reply to: