Author: jsrain Date: Wed Jan 19 13:50:20 2011 New Revision: 63212 URL: http://svn.opensuse.org/viewcvs/yast?rev=63212&view=rev Log: - adaptations for unattended migration (fate#310481) Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp?rev=63212&r1=63211&r2=63212&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/modules/Mode.ycp Wed Jan 19 13:50:20 2011 @@ -88,6 +88,12 @@ { _mode ="repair"; } + // FIXME according to what Linuxrc really writes + boolean autoupgrade = SCR::Read (.etc.install_inf.AutoUpgrade) != nil; + if (autoupgrade) + { + _mode = "autoupgrade"; + } } } @@ -113,7 +119,7 @@ if (! contains ( [ "installation", "update", "normal", "repair", "autoinstallation", "autoinst_config", - "live_installation" + "live_installation", "autoupgrade" ], new_mode)) { @@ -196,7 +202,7 @@ * we're doing an update */ global boolean update () { - return mode () == "update"; + return mode () == "update" || mode () == "autoupgrade"; } global boolean Depeche () { @@ -225,6 +231,13 @@ } /** + * doing auto-upgrade + */ +global boolean autoupgrade () { + return mode () == "autoupgrade"; +} + +/** * configuration for auto-installation, only in running system */ global boolean config () { Modified: branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp?rev=63212&r1=63211&r2=63212&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/system/src/ModuleLoading.ycp Wed Jan 19 13:50:20 2011 @@ -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/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp?rev=63212&r1=63211&r2=63212&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/library/wizard/src/Confirm.ycp Wed Jan 19 13:50:20 2011 @@ -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; Modified: branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes?rev=63212&r1=63211&r2=63212&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/yast2/package/yast2.changes Wed Jan 19 13:50:20 2011 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Wed Jan 19 13:49:48 CET 2011 - jsrain@suse.cz + +- adaptations for unattended migration (fate#310481) + +------------------------------------------------------------------- +Wed Jan 19 13:45:05 CET 2011 - jsrain@suse.cz + +- adaptations for unattended migration + +------------------------------------------------------------------- Thu Oct 7 11:08:42 UTC 2010 - lslezak@suse.cz - removed textdomain change (not needed, breaks translations) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org