X Strike Force XFree86 SVN commit: r1766 - trunk/debian
Author: fabbione
Date: 2004-08-30 13:43:39 -0500 (Mon, 30 Aug 2004)
New Revision: 1766
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
Fix validate_monitor_frequency_db_input() regexp to match for proper values.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-08-30 14:03:43 UTC (rev 1765)
+++ trunk/debian/CHANGESETS 2004-08-30 18:43:39 UTC (rev 1766)
@@ -489,4 +489,8 @@
xserver-xfree86.config.in. Thanks to Anders Dybdal.
1764
+* Fix validate_monitor_frequency_db_input() regexp to match for proper
+ values.
+ 1766
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-08-30 14:03:43 UTC (rev 1765)
+++ trunk/debian/changelog 2004-08-30 18:43:39 UTC (rev 1766)
@@ -434,6 +434,9 @@
* Add danish translation of "Generic Video Card" to
xserver-xfree86.config.in. Thanks to Anders Dybdal.
+ * Fix validate_monitor_frequency_db_input() regexp to match for proper
+ values.
+
-- Branden Robinson <branden@debian.org> Wed, 25 Aug 2004 11:41:15 -0500
xfree86 (4.3.0.dfsg.1-6) unstable; urgency=low
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-08-30 14:03:43 UTC (rev 1765)
+++ trunk/debian/xserver-xfree86.config.in 2004-08-30 18:43:39 UTC (rev 1766)
@@ -277,7 +277,7 @@
# string, needs input validation; a simple regex match will have to do;
# force first character to be a number to avoid hideous problems in the
# debconf dialog frontend in 0.3.83 (it needs to be one anyway)
- if expr "$RET" : "^[0-9][-0-9,. ]\+$" > /dev/null 2>&1; then
+ if [ "$(echo "$RET" | grep -E '^[0-9]{2,3}-[0-9]{2,3}')" ]; then
break # valid input
fi
# we only get to this point if the input was invalid; restore the known
Reply to: