Mailinglist Archive: yast-commit (410 mails)

[jsuchome@xxxxxxxxxxxxxxxxx]

Author: jsuchome
Date: Mon Jul 11 16:48:56 2011
New Revision: 64775

URL: http://svn.opensuse.org/viewcvs/yast?rev=64775&view=rev
Log:
- avoid a pop-up during unattended upgrade (bnc#704078)
- 2.21.2 


Modified:
    trunk/country/VERSION
    trunk/country/keyboard/src/modules/Keyboard.ycp
    trunk/country/package/yast2-country.changes

Modified: trunk/country/VERSION
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/country/VERSION?rev=64775&r1=64774&r2=64775&view=diff
==============================================================================
--- trunk/country/VERSION (original)
+++ trunk/country/VERSION Mon Jul 11 16:48:56 2011
@@ -1 +1 @@
-2.21.1
+2.21.2

Modified: trunk/country/keyboard/src/modules/Keyboard.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/country/keyboard/src/modules/Keyboard.ycp?rev=64775&r1=64774&r2=64775&view=diff
==============================================================================
--- trunk/country/keyboard/src/modules/Keyboard.ycp (original)
+++ trunk/country/keyboard/src/modules/Keyboard.ycp Mon Jul 11 16:48:56 2011
@@ -1338,6 +1338,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: trunk/country/package/yast2-country.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/country/package/yast2-country.changes?rev=64775&r1=64774&r2=64775&view=diff
==============================================================================
--- trunk/country/package/yast2-country.changes (original)
+++ trunk/country/package/yast2-country.changes Mon Jul 11 16:48:56 2011
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Mon Jul 11 16:39:42 CEST 2011 - jsuchome@xxxxxxx
+
+- avoid a pop-up during unattended upgrade (bnc#704078)
+- 2.21.2 
+
+-------------------------------------------------------------------
 Fri Jun 24 10:17:00 CEST 2011 - jsuchome@xxxxxxx
 
 - use ButtonBox when appropriate (bnc#701260)

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx