Author: dnusinow Date: 2006-04-29 15:48:09 -0400 (Sat, 29 Apr 2006) New Revision: 2000
Modified: trunk/debian/xorg/debian/changelog trunk/debian/xorg/debian/xserver-xorg.config.in Log: * Prevent the xserver-xorg config from failing during migration of zaxismapping and emulate3buttons questions when they don't exist. Thanks Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix. (closes: #365282) Modified: trunk/debian/xorg/debian/changelog =================================================================== --- trunk/debian/xorg/debian/changelog 2006-04-29 19:29:09 UTC (rev 1999) +++ trunk/debian/xorg/debian/changelog 2006-04-29 19:48:09 UTC (rev 2000) @@ -2,8 +2,12 @@ * Define the backup config file name before we tell people where we're backing up :-) Thanks Frans Pop and Flavio Stanchin. (closes: 365278) + * Prevent the xserver-xorg config from failing during migration of + zaxismapping and emulate3buttons questions when they don't exist. Thanks + Rodney Gordon II, Adam Borowski. Thanks to Steven Brown for a fix. + (closes: #365282) - -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Apr 2006 13:25:24 -0400 + -- David Nusinow <[EMAIL PROTECTED]> Sat, 29 Apr 2006 15:44:42 -0400 xorg (1:7.0.15) unstable; urgency=low Modified: trunk/debian/xorg/debian/xserver-xorg.config.in =================================================================== --- trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-29 19:29:09 UTC (rev 1999) +++ trunk/debian/xorg/debian/xserver-xorg.config.in 2006-04-29 19:48:09 UTC (rev 2000) @@ -460,7 +460,7 @@ # migrate from old select-type templates for TEMPLATE in xserver-xorg/config/inputdevice/mouse/emulate3buttons \ xserver-xorg/config/inputdevice/mouse/zaxismapping; do - db_get "$TEMPLATE" + db_get "$TEMPLATE" || continue if [ "$RET" = "Yes" ]; then db_set $TEMPLATE "true" elif [ "$RET" = "No" ]; then -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]