Author: locilka Date: Mon Mar 17 11:14:47 2008 New Revision: 45508 URL: http://svn.opensuse.org/viewcvs/yast?rev=45508&view=rev Log: - Automatic configuration is now disabled for mode update. - The whole second stage in now disabled for mode update. - Added help text for "Use Automatic Configuration" check-box. - 2.16.24 Modified: trunk/installation/VERSION trunk/installation/control/control.openSUSE.xml trunk/installation/package/yast2-installation.changes trunk/installation/src/clients/inst_mode.ycp Modified: trunk/installation/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/VERSION?rev=45508&r1=45507&r2=45508&view=diff ============================================================================== --- trunk/installation/VERSION (original) +++ trunk/installation/VERSION Mon Mar 17 11:14:47 2008 @@ -1 +1 @@ -2.16.23 +2.16.24 Modified: trunk/installation/control/control.openSUSE.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/control/control.openSUSE.xml?rev=45508&r1=45507&r2=45508&view=diff ============================================================================== --- trunk/installation/control/control.openSUSE.xml (original) +++ trunk/installation/control/control.openSUSE.xml Mon Mar 17 11:14:47 2008 @@ -542,6 +542,8 @@ </workflow> <!-- Stage: Continue, Mode: Update --> + <!-- + Second stage for update has been disabled by FATE #303396 <workflow> <stage>continue</stage> <mode>update</mode> @@ -604,6 +606,7 @@ </module> </modules> </workflow> + --> <!-- Stage: Continue, Mode: Installation --> <workflow> Modified: trunk/installation/package/yast2-installation.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/package/yast2-installation.changes?rev=45508&r1=45507&r2=45508&view=diff ============================================================================== --- trunk/installation/package/yast2-installation.changes (original) +++ trunk/installation/package/yast2-installation.changes Mon Mar 17 11:14:47 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Mar 17 11:04:38 CET 2008 - locilka@suse.cz + +- Automatic configuration is now disabled for mode update. +- The whole second stage in now disabled for mode update. +- Added help text for "Use Automatic Configuration" check-box. +- 2.16.24 + +------------------------------------------------------------------- Fri Mar 14 15:02:27 CET 2008 - locilka@suse.cz - Added possibility to run automatic configuration instead of the Modified: trunk/installation/src/clients/inst_mode.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/installation/src/clients/inst_mode.ycp?rev=45508&r1=45507&r2=45508&view=diff ============================================================================== --- trunk/installation/src/clients/inst_mode.ycp (original) +++ trunk/installation/src/clients/inst_mode.ycp Mon Mar 17 11:14:47 2008 @@ -175,7 +175,7 @@ `Left (`CheckBox ( `id (`use_automatic_configuration), `opt(`notify), // check box - _("Use Automatic Configuration"), + _("&Use Automatic Configuration"), ProductControl::GetUseAutomaticConfiguration() )) ), @@ -215,6 +215,14 @@ ") + // help text for installation method + _("<p> +To let new installation create an automatic configuration, select +<b>Use Automatic Configuration</b>. Otherwise second stage installation +with configuration proposals will be called instead. Update mode does not +support automatic configuration.</p> +") + + + // help text for installation method _("<p>Select <b>Repair Installed System</b> if you have a damaged Linux system on your hard disk. This option can try to fix problems automatically. </p>") + @@ -311,24 +319,23 @@ ret = nil; continue; } + // Adjusting current UI - Hide Other Options // in case of `install or `update clicked else if (contains([`install, `update], ret)) { symbol selected_mode = (symbol) UI::QueryWidget (`id (`inst_mode), `CurrentButton); foreach (list one_item, [ - [`add_on, Installation::add_on_selected], - [`productsources, Installation::add_on_selected], - [`use_automatic_configuration, ProductControl::GetUseAutomaticConfiguration()], + [`add_on, Installation::add_on_selected, true], + [`productsources, Installation::add_on_selected, true], + // automatic installation works only for new installation + [`use_automatic_configuration, (ret == `install ? ProductControl::GetUseAutomaticConfiguration():false), (ret == `install)], ], { - if (UI::WidgetExists (`id (one_item[0]:`_item_not_defined))) { - UI::ChangeWidget (`id (one_item[0]:`_item_not_defined), `Enabled, true); - UI::ChangeWidget (`id (one_item[0]:`_item_not_defined), `Value, (boolean) one_item[1]:false); + if (UI::WidgetExists (`id (one_item[0]:`_inotdef_))) { + UI::ChangeWidget (`id (one_item[0]:`_inotdef_), `Enabled, one_item[2]:false); + UI::ChangeWidget (`id (one_item[0]:`_inotdef_), `Value, one_item[1]:false); } }); - - // Can be either `install or `update - UI::ChangeWidget (`id(`inst_mode), `CurrentButton, selected_mode); } // Next button @@ -365,6 +372,9 @@ if (new_mode == `update) { Mode::SetMode ("update"); + + // update mode doesn't support automatic configuration + ProductControl::SetUseAutomaticConfiguration (false); } if (new_mode == `repair) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org