Author: branden
Date: 2004-09-03 12:30:25 -0500 (Fri, 03 Sep 2004)
New Revision: 1794
Modified:
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
(cosmetic) Indulge my OCD my tidying up trace message output.
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-03
08:52:43 UTC (rev 1793)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-03
17:30:25 UTC (rev 1794)
@@ -1835,9 +1835,9 @@
# from a package version that didn't support it.
if [ -n "$2" ] && dpkg --compare-versions "$2" lt "4.3.0.dfsg.1-7"; then
db_get xserver-xfree86/config/modules
- # Only add the module if it's not already there and extmod is loaded.
+ # Only add the module if it's not already there and if extmod is present in
+ # the list.
if expr "$RET" : ".*extmod.*" >/dev/null 2>&1; then
- trace "extmod is enable: try to enable v4l if not already"
if ! expr "$RET" : ".*v4l.*" >/dev/null 2>&1; then
trace "upgrading from package version $2; adding v4l to list of
selected" \
"modules"
@@ -1848,9 +1848,11 @@
db_set xserver-xfree86/config/modules "$SELECTED_MODULES"
db_get xserver-xfree86/config/modules
trace "new value of template \"xserver-xfree86/config/modules\":
\"$RET\""
+ else
+ trace "not adding v4l to list of selected modules; v4l already present"
fi
else
- trace "extmod is disable: do not attempt to enable v4l"
+ trace "not adding v4l to list of selected modules; extmod not selected"
fi
fi
