X Strike Force XFree86 SVN commit: r1910 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-10-04 01:51:44 -0500 (Mon, 04 Oct 2004)
New Revision: 1910
Modified:
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
Remove redundant call to select_default_x_server() in
configure_xfree86_x_server() -- that function is already called from the
top level of the script ("main").
Clarify a comment.
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-10-04 06:47:34 UTC (rev 1909)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-10-04 06:51:44 UTC (rev 1910)
@@ -1964,8 +1964,6 @@
return 1
fi
- select_default_x_server
-
# If the XFree86 4.x X server configuration file already exists, it's not as
# important to ask questions related to it (these questions "have a reasonable
# default").
@@ -2146,7 +2144,7 @@
# Do not be tempted to move this into the "if select_default_x_server" block
# above; we want to permit the user to reconfigure the XF86Config-4 file even if
-# the default X server is being handled manually.
+# the choice of default X server is being handled manually.
if [ -z "$SKIP_XFREE86_X_SERVER_CONFIG" ]; then
if ! configure_xfree86_x_server; then
Reply to: