Mailinglist Archive: yast-commit (183 mails)

[jsrain@xxxxxxxxxxxxxxxxx]

Author: jsrain
Date: Tue Oct 12 11:23:09 2010
New Revision: 62597

URL: http://svn.opensuse.org/viewcvs/yast?rev=62597&view=rev
Log:
avoid interruption of automated upgrade process (bnc#644637)

Modified:
    
branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp
    
branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp

Modified: 
branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp?rev=62597&r1=62596&r2=62597&view=diff
==============================================================================
--- 
branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp
 (original)
+++ 
branches/tmp/jsrain/unattended-migration/yast2/library/system/src/ModuleLoading.ycp
 Tue Oct 12 11:23:09 2010
@@ -132,7 +132,7 @@
                return `dont;
            }
 
-           if (ask_before_loading && !Mode::autoinst())
+           if (ask_before_loading && (!Mode::autoinst()) && 
(!Mode::autoupgrade()))
            {
 
                UI::OpenDialog(`opt(`decorated, `centered),

Modified: 
branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp?rev=62597&r1=62596&r2=62597&view=diff
==============================================================================
--- 
branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp 
(original)
+++ 
branches/tmp/jsrain/unattended-migration/yast2/library/wizard/src/Confirm.ycp 
Tue Oct 12 11:23:09 2010
@@ -40,7 +40,7 @@
     if(Linuxrc::manual () != true) return true;
 
     // L3: no interaction in AY, just re-probe (bnc#568653)
-    if(Mode::autoinst () == true) return true;
+    if(Mode::autoinst () == true || Mode::autoupgrade() == true) return true;
 
     if(Arch::s390()) return true;
 

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