Author: jsrain Date: Wed Oct 5 13:11:21 2011 New Revision: 66253 URL: http://svn.opensuse.org/viewcvs/yast?rev=66253&view=rev Log: prevent unwanted change of autoupgrade mode to autoinstallation (bnc#722249) Modified: trunk/autoinstallation/VERSION trunk/autoinstallation/package/autoyast2.changes trunk/autoinstallation/src/modules/AutoInstall.ycp Modified: trunk/autoinstallation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/VERSION?rev=66253&r1=66252&r2=66253&view=diff ============================================================================== --- trunk/autoinstallation/VERSION (original) +++ trunk/autoinstallation/VERSION Wed Oct 5 13:11:21 2011 @@ -1 +1 @@ -2.21.3 +2.21.4 Modified: trunk/autoinstallation/package/autoyast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/package/autoyast2.changes?rev=66253&r1=66252&r2=66253&view=diff ============================================================================== --- trunk/autoinstallation/package/autoyast2.changes (original) +++ trunk/autoinstallation/package/autoyast2.changes Wed Oct 5 13:11:21 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Oct 5 10:57:39 UTC 2011 - jsrain@site + +- prevent unwanted change of autoupgrade mode to autoinstallation + (bnc#722249) +- 2.21.4 + +------------------------------------------------------------------- Tue Oct 4 16:34:38 CEST 2011 - ug@suse.de - removed TrustGpgKey (bnc#722012) Modified: trunk/autoinstallation/src/modules/AutoInstall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/modules/AutoInstall.ycp?rev=66253&r1=66252&r2=66253&view=diff ============================================================================== --- trunk/autoinstallation/src/modules/AutoInstall.ycp (original) +++ trunk/autoinstallation/src/modules/AutoInstall.ycp Wed Oct 5 13:11:21 2011 @@ -134,12 +134,19 @@ { boolean ret = Continue(); if (ret && size ( Profile::current ) > 0) { - y2milestone("Enabling Auto-Installation mode"); - Mode::SetMode("autoinstallation"); + if (Mode::autoupgrade()) { + y2milestone ("AutoYaST upgrade mode already set, keeping it"); + } else { + y2milestone("Enabling Auto-Installation mode"); + Mode::SetMode("autoinstallation"); + } } else if (Mode::autoinst ()) { y2milestone("No autoyast data found, switching back to manual installation"); Mode::SetMode("installation"); - } + } else if (Mode::autoupgrade ()) { + y2milestone("No autoyast data found, switching back to manual update"); + Mode::SetMode("update"); + } } else if (Stage::initial ()) { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org