Author: jsrain Date: Fri Jul 8 09:38:43 2011 New Revision: 64768 URL: http://svn.opensuse.org/viewcvs/yast?rev=64768&view=rev Log: avoid a pop-up during unattended upgrade (bnc#704078) Modified: branches/SuSE-Code-11-SP2-Branch/country/VERSION branches/SuSE-Code-11-SP2-Branch/country/keyboard/src/modules/Keyboard.ycp branches/SuSE-Code-11-SP2-Branch/country/package/yast2-country.changes Modified: branches/SuSE-Code-11-SP2-Branch/country/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/country/VERSION?rev=64768&r1=64767&r2=64768&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/country/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/country/VERSION Fri Jul 8 09:38:43 2011 @@ -1 +1 @@ -2.17.50 +2.17.51 Modified: branches/SuSE-Code-11-SP2-Branch/country/keyboard/src/modules/Keyboard.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/country/keyboard/src/modules/Keyboard.ycp?rev=64768&r1=64767&r2=64768&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/country/keyboard/src/modules/Keyboard.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/country/keyboard/src/modules/Keyboard.ycp Fri Jul 8 09:38:43 2011 @@ -1401,6 +1401,12 @@ */ global define void CheckKeyboardDuringUpdate (string destdir) { + // autoupgrade is not interactive, therefore skip this check and use data + // from profile directly + if (Mode::autoupgrade()) { + return; + } + string target_kbd = Misc::CustomSysconfigRead ( "YAST_KEYBOARD", current_kbd, destdir + "/etc/sysconfig/keyboard"); integer pos = find (target_kbd, ","); Modified: branches/SuSE-Code-11-SP2-Branch/country/package/yast2-country.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/country/package/yast2-country.changes?rev=64768&r1=64767&r2=64768&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/country/package/yast2-country.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/country/package/yast2-country.changes Fri Jul 8 09:38:43 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jul 8 09:20:31 CEST 2011 - jsrain@suse.cz + +- avoid a pop-up during unattended upgrade (bnc#704078) +- 2.17.51 + +------------------------------------------------------------------- Tue Nov 9 15:18:23 CET 2010 - jsuchome@suse.cz - call mkinitrd on hwclock changes (bnc#638128) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org