Author: locilka Date: Tue Feb 15 13:34:09 2011 New Revision: 63418 URL: http://svn.opensuse.org/viewcvs/yast?rev=63418&view=rev Log: - Correctly disabling Update and Repair options if no previous system is found by the system analysis (BNC #664907). - 2.17.77 Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp Modified: branches/SuSE-Code-11-SP2-Branch/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/VERSION?rev=63418&r1=63417&r2=63418&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/VERSION (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/VERSION Tue Feb 15 13:34:09 2011 @@ -1 +1 @@ -2.17.76 +2.17.77 Modified: branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes?rev=63418&r1=63417&r2=63418&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/package/yast2-installation.changes Tue Feb 15 13:34:09 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Feb 15 13:31:29 CET 2011 - locilka@suse.cz + +- Correctly disabling Update and Repair options if no previous + system is found by the system analysis (BNC #664907). +- 2.17.77 + +------------------------------------------------------------------- Thu Jan 20 14:18:41 CET 2011 - jsrain@suse.cz - fix initialization of AutoUpgrade for 2nd stage Modified: branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp?rev=63418&r1=63417&r2=63418&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/installation/src/clients/inst_mode.ycp Tue Feb 15 13:34:09 2011 @@ -89,16 +89,6 @@ Pkg::TargetFinish(); } -boolean other_options_disabled = false; - -if (! (InstData::have_linux && InstData::offer_update)) -{ - // to offer add-on products - // Mode::SetMode ("installation"); - // return `auto; - other_options_disabled = true; -} - // bugzilla #208222 // Release disk used as the installation source ReleaseHDDUsedAsInstallationSource(); @@ -255,10 +245,10 @@ string media = Linuxrc::InstallInf ("InstMode"); y2milestone ("Umount result: %1, inst mode: %2", umount_result, media); -other_options_disabled = false; +boolean other_options_enabled = (InstData::have_linux && InstData::offer_update); // only installation (and addon products) enabled -if (other_options_disabled) { +if (other_options_enabled != true) { UI::ChangeWidget (`id (`update), `Enabled, false); UI::ChangeWidget (`id (`repair), `Enabled, false); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org