X Strike Force XFree86 SVN commit: r1856 - branches/debconf-overhaul/debian
Author: branden
Date: 2004-09-22 17:53:14 -0500 (Wed, 22 Sep 2004)
New Revision: 1856
Modified:
branches/debconf-overhaul/debian/xserver-xfree86.config.in
Log:
In configure_mouse(), standardize the message used when the subarchitecture is
not recognized.
Spell "subarchitecture" consistently (without a hyphen).
Modified: branches/debconf-overhaul/debian/xserver-xfree86.config.in
===================================================================
--- branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:28:23 UTC (rev 1855)
+++ branches/debconf-overhaul/debian/xserver-xfree86.config.in 2004-09-22 22:53:14 UTC (rev 1856)
@@ -1143,7 +1143,7 @@
default_port="/dev/input/mice"
;;
m68k)
- # A good default for m68k depends on which sub-architecure this is.
+ # A good default for m68k depends on which subarchitecure this is.
if [ -r /proc/hardware ]; then
subarch=$(grep -w "Model:" | sed 's/Model:[[:space:]]+//')
case "$subarch" in
@@ -1164,9 +1164,12 @@
trace "$func(): no good defaults known for Q40/Q60 mouse"
"configuration"
;;
+ *)
+ trace "$func(): unrecognized m68k subarchitecture \"$subarch\""
+ ;;
esac
else
- trace "$func(): cannot autodetect m68k sub-architecture;" \
+ trace "$func(): cannot autodetect m68k subarchitecture;" \
"/proc/hardware does not exist or is not readable"
fi
;;
@@ -1174,7 +1177,7 @@
trace "$func(): no good defaults known for MIPS mouse configuration"
;;
powerpc)
- # A good default for PowerPC depends on which sub-architecure this is.
+ # A good default for PowerPC depends on which subarchitecure this is.
if [ -r /proc/cpuinfo ]; then
subarch=$(grep "^machine" | sed 's/machine[[:space:]]+:[[:space:]]+//')
case "$subarch" in
@@ -1190,12 +1193,11 @@
fi
;;
*)
- trace "$func(): no good defaults known for non-PowerMac PowerPC" \
- "mouse configuration"
+ trace "$func(): unrecognized powerpc subarchitecture \"$subarch\""
;;
esac
else
- trace "$func(): cannot autodetect PowerPC sub-architecture;" \
+ trace "$func(): cannot autodetect PowerPC subarchitecture;" \
"/proc/cpuinfo does not exist or is not readable"
fi
;;
Reply to: