Author: locilka Date: Wed Mar 3 15:31:14 2010 New Revision: 61125 URL: http://svn.opensuse.org/viewcvs/yast?rev=61125&view=rev Log: - Added new possibility to check used repositories (modified by Customer Center) before migration (BNC #579905). The very same dialog is also used for manual way of adjusting repositories. - Fixed 'Migration Type' dialog layout (BNC #582239). Added: trunk/wagon/src/clients/wagon_repositories_handler.ycp Modified: trunk/wagon/package/yast2-wagon.changes trunk/wagon/src/clients/wagon_update_url.ycp trunk/wagon/src/config/online_migration.xml trunk/wagon/src/modules/Wagon.ycp Modified: trunk/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/package/yast2-wagon.changes?rev=61125&r1=61124&r2=61125&view=diff ============================================================================== --- trunk/wagon/package/yast2-wagon.changes (original) +++ trunk/wagon/package/yast2-wagon.changes Wed Mar 3 15:31:14 2010 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Mar 2 19:10:10 CET 2010 - locilka@suse.cz + +- Added new possibility to check used repositories (modified by + Customer Center) before migration (BNC #579905). The very same + dialog is also used for manual way of adjusting repositories. +- Fixed 'Migration Type' dialog layout (BNC #582239). + +------------------------------------------------------------------- Fri Feb 19 15:29:38 CET 2010 - locilka@suse.cz - Fixed help text (BNC #583177). Added: trunk/wagon/src/clients/wagon_repositories_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_repositories_handler.ycp?rev=61125&view=auto ============================================================================== --- trunk/wagon/src/clients/wagon_repositories_handler.ycp (added) +++ trunk/wagon/src/clients/wagon_repositories_handler.ycp Wed Mar 3 15:31:14 2010 @@ -0,0 +1,63 @@ +/** + * File: + * clients/wagon_repositories_handler.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka + * + * Summary: + * Online Migration Tool + * + * $Id:$ + * + */ + +{ + /** + * This is a handler scipt for YaST repositories. + * See more in BNC #579905 + */ + + import "Wagon"; + import "Mode"; + import "GetInstArgs"; + import "Popup"; + + textdomain "wagon"; + + // YaST Repositories does not provide [Back][Next] buttons, only [OK][Cancel] + // It's needed to skip it if going_back in the workflow + if (GetInstArgs::going_back()) { + y2milestone ("'going back', skipping this dialog, going to the previous one"); + return `auto; + } + + symbol ret = `auto; + + while (true) { +// Mode::SetMode ("normal"); + y2milestone ("Running repositories..."); + ret = (symbol) WFM::call ("repositories"); + y2milestone ("Script inst_suse_register returned: %1", ret); +// Mode::SetMode ("update"); + + if (ret == `cancel || ret == `abort) { + if (Popup::ConfirmAbort (`painless)) { + ret = `abort; + break; + } + continue; + } else { + ret = `next; + break; + } + } + + // YaST Repositories stores all repos to disk, it's needed to reload them + Wagon::InitPkg(); + + return ret; +} Modified: trunk/wagon/src/clients/wagon_update_url.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/clients/wagon_update_url.ycp?rev=61125&r1=61124&r2=61125&view=diff ============================================================================== --- trunk/wagon/src/clients/wagon_update_url.ycp (original) +++ trunk/wagon/src/clients/wagon_update_url.ycp Wed Mar 3 15:31:14 2010 @@ -24,8 +24,8 @@ textdomain "wagon"; - string frame_label = _("Select from where to get the update URL"); - integer frame_width = (UI::TextMode() ? 2 * size (frame_label) : size (frame_label)); + string frame_label = _("Select from Where to Get the Update URL"); + integer frame_width = (UI::TextMode() ? 2 * size (frame_label) : 2.2 * size (frame_label)); string current_workflow = Wagon::GetUpdateWorkflow(); @@ -43,7 +43,13 @@ `VBox ( `HBox ( `HBox (`Image (Icon::IconPath ("yast-update"), ""), `HSpacing (2)), - `RadioButton (`id (`suse_register), _("&Customer Center"), (current_workflow == "manual_suse_register")), + `VBox ( + `Left(`RadioButton (`id (`suse_register), _("&Customer Center"), (current_workflow == "manual_suse_register"))), + `HBox ( + `HSpacing (2), + `Left(`CheckBox (`id (`manual_check), _("Check Automatic &Repository Changes"), Wagon::check_repositories_manually)) + ) + ), `HStretch() ), `VSpacing (1), @@ -57,10 +63,16 @@ ) ))); - string heading_text = _("Update URL"); + string heading_text = _("Update Method"); - // FIXME: ... - string help_text = _("FIXME: some help text"); + // help text 1 + string help_text = _("<p>Here you can choose whether to use the <b>Customer Center</b> +to handle the installation repositories during migration or use <b>Custom &URL</b> +if you want to set them manually.</p>") + + // help text 2 + _("<p>Additionally, select <b>Check Automatic Repository Changes</b> to ensure +that Customer Center has modified the repositories correctly. You can also modify +them there too.</p>"); Wizard::SetContents (heading_text, contents, help_text, GetInstArgs::enable_back(), GetInstArgs::enable_next()); @@ -80,13 +92,21 @@ y2milestone ("Selected workflow: %1", selected); if (selected == `suse_register) { + Wagon::check_repositories_manually = ((boolean) UI::QueryWidget (`id (`manual_check), `Value) == true); + y2milestone ("Checking repos manually: %1", Wagon::check_repositories_manually); Wagon::SetUpdateWorkflow ("manual_suse_register"); } else if (selected == `custom_url) { + // custom URL uses the same dialog in a different context + Wagon::check_repositories_manually = false; + y2milestone ("Checking repos manually: %1", Wagon::check_repositories_manually); Wagon::SetUpdateWorkflow ("manual_custom_url"); } + Wagon::AdjustVariableSteps(); // Check whether we have a useful workflow - if (Wagon::AdjustWizardSteps()) { + if (Wagon::SetWizardSteps()) { + Wagon::AdjustVariableSteps(); + Wagon::RedrawWizardSteps(); ret = `next; break; } Modified: trunk/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/trunk/wagon/src/config/online_migration.xml?rev=61125&r1=61124&r2=61125&view=diff ============================================================================== --- trunk/wagon/src/config/online_migration.xml (original) +++ trunk/wagon/src/config/online_migration.xml Wed Mar 3 15:31:14 2010 @@ -59,9 +59,10 @@ <!-- Workflow is switched after this module --> <module>update_url_dialog</module> <module>suse_register_workflow</module> - <module>wagon_custom_url</module> + <module>wagon_manual_url_repositories</module> <module>wagon_selfupdate_from_url</module> <module>wagon_modify_repositories</module> + <module>wagon_check_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -88,6 +89,7 @@ <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_modify_repositories</module> + <module>wagon_check_repositories</module> <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -112,7 +114,7 @@ <module>install_migration_products</module> <!-- Workflow is switched after this module --> <module>update_url_dialog</module> - <module>wagon_custom_url</module> + <module>wagon_manual_url_repositories</module> <module>wagon_selfupdate_from_url</module> <module>wagon_modify_repositories</module> <module>prepare_progress</module> @@ -255,8 +257,8 @@ --> <module> <label>Migration Configuration</label> - <name>wagon_custom_url</name> - <execute>wagon_custom_url</execute> + <name>wagon_manual_url_repositories</name> + <execute>wagon_repositories_handler</execute> </module> Reply