March 2010 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r61124 - in /branches/SuSE-Code-11-Branch/wagon: ./ package/ src/clients/ src/config/ src/modules/
by locilka＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: locilka Date: Wed Mar 3 15:30:52 2010 New Revision: 61124 URL: http://svn.opensuse.org/viewcvs/yast?rev=61124&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). - 2.17.8.7 Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_repositories_handler.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_update_url.ycp branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/VER… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-Branch/wagon/VERSION Wed Mar 3 15:30:52 2010 @@ -1 +1 @@ -2.17.8.6 +2.17.8.7 Modified: branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/pac… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-Branch/wagon/package/yast2-wagon.changes Wed Mar 3 15:30:52 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Mar 2 19:10:10 CET 2010 - locilka(a)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). +- 2.17.8.7 + +------------------------------------------------------------------- Fri Feb 19 15:29:38 CET 2010 - locilka(a)suse.cz - Fixed help text (BNC #583177). Added: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_repositories_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_repositories_handler.ycp (added) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_repositories_handler.ycp Wed Mar 3 15:30:52 2010 @@ -0,0 +1,63 @@ +/** + * File: + * clients/wagon_repositories_handler.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * 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: branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_update_url.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_update_url.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/clients/wagon_update_url.ycp Wed Mar 3 15:30:52 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 = _("Here you can choose whether to use the Customer Center +to handle the installation repositories during migration or use Custom &URL +if you want to set them manually.") + + // help text 2 + _("Additionally, select Check Automatic Repository Changes to ensure +that Customer Center has modified the repositories correctly. You can also modify +them there too."); 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: branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-Branch/wagon/src/config/online_migration.xml Wed Mar 3 15:30:52 2010 @@ -59,9 +59,10 @@  <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>  <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> @@ -254,8 +256,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>  + <module> + <label>Migration Configuration</label> + <name>wagon_custom_url</name> + <execute>wagon_custom_url</execute> + </module> + <module> <label>Migration Configuration</label> <name>wagon_modify_repositories</name> <execute>wagon_modify_repositories</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>wagon_check_repositories</name> + <execute>wagon_repositories_handler</execute> + </module> + <module> <heading>yes</heading> <label>Migration</label> Modified: branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-Branch/wagon/src… ============================================================================== --- branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-Branch/wagon/src/modules/Wagon.ycp Wed Mar 3 15:30:52 2010 @@ -56,6 +56,14 @@ // added by registration global boolean repos_already_registered = false; + // Script suse_register changes the repositories automatically. + // Additionally, Wagon also disables some repositories. This option provides + // the possibility to check what was changed and how and/or add/remove some more. + // BNC #579905 + global boolean check_repositories_manually = false; + + string check_repos_module = "wagon_check_repositories"; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -71,7 +79,10 @@ ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } - global boolean AdjustWizardSteps () { + /** + * Replaces the current workflow steps with a new one. + */ + global boolean SetWizardSteps () { // Adjusting the steps this way: // * Disable all steps // * Enable only the requierd ones @@ -88,7 +99,7 @@ foreach (map <string, any> one_subworkflow, subworkflows, { if (one_subworkflow["name"]:"" == update_workflow_type) { list <string> modules = (list <string>) one_subworkflow["modules"]:[]; - y2milestone ("Modules: %1", modules); + y2milestone ("Modules to enable: %1", modules); if (modules != nil && modules != []) { foreach (string one_module, modules, { @@ -97,7 +108,7 @@ } list <string> proposals = (list <string>) one_subworkflow["proposals"]:[]; - y2milestone ("Proposals: %1", proposals); + y2milestone ("Proposals to enable: %1", proposals); if (proposals != nil && proposals != []) { foreach (string one_proposal, proposals, { @@ -118,6 +129,27 @@ return false; } + return true; + } + + /** + * Handles the optional workflow steps according to the current settigns. + */ + global void AdjustVariableSteps () { + // BNC #579905: Check modified repositories manually. + if (check_repositories_manually != false) { + y2milestone ("Enabling module %1", check_repos_module); + ProductControl::EnableModule (check_repos_module); + } else { + y2milestone ("Disabling module %1", check_repos_module); + ProductControl::DisableModule (check_repos_module); + } + } + + /** + * Redraws the wizard steps according to current workflow settings. + */ + global void RedrawWizardSteps () { list<map> stage_mode = [ $[ "stage" : Stage::stage(), @@ -128,6 +160,17 @@ y2milestone ("Updating wizard steps: %1, Disabled modules: %2, Disabled proposals: %3", stage_mode, ProductControl::GetDisabledModules(), ProductControl::GetDisabledProposals()); ProductControl::UpdateWizardSteps (stage_mode); + } + + /** + * Sets wizard steps and redraws the UI. + */ + global boolean AdjustWizardSteps () { + if (SetWizardSteps() != true) { + return false; + } + + RedrawWizardSteps(); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61123 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/clients/ src/config/ src/modules/
by locilka＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: locilka Date: Wed Mar 3 15:30:27 2010 New Revision: 61123 URL: http://svn.opensuse.org/viewcvs/yast?rev=61123&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). - 2.17.16 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_url.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/VERSION Wed Mar 3 15:30:27 2010 @@ -1 +1 @@ -2.17.15 +2.17.16 Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes Wed Mar 3 15:30:27 2010 @@ -1,4 +1,13 @@ ------------------------------------------------------------------- +Tue Mar 2 19:10:10 CET 2010 - locilka(a)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). +- 2.17.16 + +------------------------------------------------------------------- Fri Feb 19 15:29:38 CET 2010 - locilka(a)suse.cz - Fixed help text (BNC #583177). Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp (added) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp Wed Mar 3 15:30:27 2010 @@ -0,0 +1,63 @@ +/** + * File: + * clients/wagon_repositories_handler.ycp + * + * Module: + * Wagon + * + * Authors: + * Lukas Ocilka <locilka(a)suse.cz> + * + * 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: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_url.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_url.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_url.ycp Wed Mar 3 15:30:27 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 = _("Here you can choose whether to use the Customer Center +to handle the installation repositories during migration or use Custom &URL +if you want to set them manually.") + + // help text 2 + _("Additionally, select Check Automatic Repository Changes to ensure +that Customer Center has modified the repositories correctly. You can also modify +them there too."); 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: branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml Wed Mar 3 15:30:27 2010 @@ -59,9 +59,10 @@  <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>  <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> @@ -254,8 +256,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>  + <module> + <label>Migration Configuration</label> + <name>wagon_custom_url</name> + <execute>wagon_custom_url</execute> + </module> + <module> <label>Migration Configuration</label> <name>wagon_modify_repositories</name> <execute>wagon_modify_repositories</execute> </module> +  + <module> + <label>Migration Configuration</label> + <name>wagon_check_repositories</name> + <execute>wagon_repositories_handler</execute> + </module> + <module> <heading>yes</heading> <label>Migration</label> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp Wed Mar 3 15:30:27 2010 @@ -56,6 +56,14 @@ // added by registration global boolean repos_already_registered = false; + // Script suse_register changes the repositories automatically. + // Additionally, Wagon also disables some repositories. This option provides + // the possibility to check what was changed and how and/or add/remove some more. + // BNC #579905 + global boolean check_repositories_manually = false; + + string check_repos_module = "wagon_check_repositories"; + global void SetUpdateWorkflow (string new_update_workflow_type) { // FIXME: check @@ -71,7 +79,10 @@ ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } - global boolean AdjustWizardSteps () { + /** + * Replaces the current workflow steps with a new one. + */ + global boolean SetWizardSteps () { // Adjusting the steps this way: // * Disable all steps // * Enable only the requierd ones @@ -88,7 +99,7 @@ foreach (map <string, any> one_subworkflow, subworkflows, { if (one_subworkflow["name"]:"" == update_workflow_type) { list <string> modules = (list <string>) one_subworkflow["modules"]:[]; - y2milestone ("Modules: %1", modules); + y2milestone ("Modules to enable: %1", modules); if (modules != nil && modules != []) { foreach (string one_module, modules, { @@ -97,7 +108,7 @@ } list <string> proposals = (list <string>) one_subworkflow["proposals"]:[]; - y2milestone ("Proposals: %1", proposals); + y2milestone ("Proposals to enable: %1", proposals); if (proposals != nil && proposals != []) { foreach (string one_proposal, proposals, { @@ -118,6 +129,27 @@ return false; } + return true; + } + + /** + * Handles the optional workflow steps according to the current settigns. + */ + global void AdjustVariableSteps () { + // BNC #579905: Check modified repositories manually. + if (check_repositories_manually != false) { + y2milestone ("Enabling module %1", check_repos_module); + ProductControl::EnableModule (check_repos_module); + } else { + y2milestone ("Disabling module %1", check_repos_module); + ProductControl::DisableModule (check_repos_module); + } + } + + /** + * Redraws the wizard steps according to current workflow settings. + */ + global void RedrawWizardSteps () { list<map> stage_mode = [ $[ "stage" : Stage::stage(), @@ -128,6 +160,17 @@ y2milestone ("Updating wizard steps: %1, Disabled modules: %2, Disabled proposals: %3", stage_mode, ProductControl::GetDisabledModules(), ProductControl::GetDisabledProposals()); ProductControl::UpdateWizardSteps (stage_mode); + } + + /** + * Sets wizard steps and redraws the UI. + */ + global boolean AdjustWizardSteps () { + if (SetWizardSteps() != true) { + return false; + } + + RedrawWizardSteps(); return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61122 - /tags/branch-Code-11-SP1-2_17_32/ldap-server/
by rhafer＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: rhafer Date: Wed Mar 3 14:16:58 2010 New Revision: 61122 URL: http://svn.opensuse.org/viewcvs/yast?rev=61122&view=rev Log: Created tag branch-Code-11-SP1-2_17_32 for ldap-server Added: tags/branch-Code-11-SP1-2_17_32/ldap-server/ (props changed) - copied from r61121, branches/SuSE-Code-11-SP1-Branch/ldap-server/ -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61121 - in /branches/SuSE-Code-11-SP1-Branch/ldap-server: VERSION package/yast2-ldap-server.changes
by rhafer＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: rhafer Date: Wed Mar 3 14:16:45 2010 New Revision: 61121 URL: http://svn.opensuse.org/viewcvs/yast?rev=61121&view=rev Log: preparing 2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/VERSION Wed Mar 3 14:16:45 2010 @@ -1 +1 @@ -2.17.31 +2.17.32 Modified: branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/ldap-… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/ldap-server/package/yast2-ldap-server.changes Wed Mar 3 14:16:45 2010 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue Mar 2 14:58:07 UTC 2010 - rhafer(a)novell.com + +- Version 2.17.32 +- use Hostname Module (for /etc/HOSTNAME fallback) to get the + local domainname (bnc#583786) + +------------------------------------------------------------------- Mon Feb 22 12:22:01 UTC 2010 - rhafer(a)novell.com - Version 2.17.31 -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61120 - /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc
by aschnell＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: aschnell Date: Wed Mar 3 13:07:39 2010 New Revision: 61120 URL: http://svn.opensuse.org/viewcvs/yast?rev=61120&view=rev Log: - fixed logging Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Wed Mar 3 13:07:39 2010 @@ -1166,7 +1166,7 @@ std::ostream& operator<< (std::ostream& s, const MdPartCo& d ) { s << *((Container*)&d); - s << " Name:" << d.md_name + s << " md_name:" << d.md_name << " MdNr:" << d.mnr << " PNum:" << d.num_part; if( !d.udev_id.empty() ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61119 - /branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc
by aschnell＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: aschnell Date: Wed Mar 3 12:58:08 2010 New Revision: 61119 URL: http://svn.opensuse.org/viewcvs/yast?rev=61119&view=rev Log: - fixed logging Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/MdPartCo.cc Wed Mar 3 12:58:08 2010 @@ -1548,8 +1548,8 @@ if( has_container ) { MdPartCo::getUuidName(parent_container,parent_uuid,parent_md_name); - y2mil("md_name="<<md_name<<", parent_container="<<parent_container - <<", parent_uuid="<<parent_uuid<<", parent_md_name"<<parent_md_name); + y2mil("md_name:" << md_name << " parent_container:" << parent_container << + " parent_uuid:" << parent_uuid << " parent_md_name:" << parent_md_name); } y2mil("Done"); } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61118 - /trunk/printer/package/yast2-printer.changes
by jsmeix＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: jsmeix Date: Wed Mar 3 12:28:12 2010 New Revision: 61118 URL: http://svn.opensuse.org/viewcvs/yast?rev=61118&view=rev Log: The last "svn commit" log entry contains a copy&paste type with a wrong revision "r303". Actually I did a rollback from r61104 (where mzugec had implemented a broken fix for AutoYaST bnc#582680) to the previous yast2-printer revision r61091. Now I added my SVN commit logs for r60617, r60828, r60849, and r61091 to yast2-printer.changes to have it also up to date there. Modified: trunk/printer/package/yast2-printer.changes Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Mar 3 12:28:12 2010 @@ -1,4 +1,33 @@ ------------------------------------------------------------------- +Wed Mar 3 12:18:38 CET 2010 - jsmeix(a)suse.de + +- Fixed tools/autodetect_print_queues by testing for the + positive "lpstat -r" output "scheduler is running" + the same way as already implemented in src/Printerlib.ycp + (bnc#584540). +- Fixed testpage printing in overview.ycp: + When testpage printing failed, the queue may have + become disabled so that a refresh of the overview content + is needed (e.g. to show the new queue state). + Added support to show the particular logging info + in /var/log/cups/error_log for the testpage print job + when the user clicked "Testpage printing failed". +- In CUPS version 1.5 SCSI printer support will be dropped, + see http://www.cups.org/str.php?L3500 + i.e. the CUPS scsi backend will be dropped. + Therefore in yast2-printer SCSI printer support is + also dropped in connectionwizard.ycp and helps.ycp. + Nevertheless because of the dropped scsi backend + there is at least a user notification Popup::ErrorDetails + if the scsi backend is used for a queue but there + is no /usr/lib*/cups/backend/scsi (bnc#580121). +- In none of the bash scripts for yast2-printer bash globbing + is needed. Actually in all those scripts no bash globbing + should happen. Therefore I added to all those scripts + a "set -f" line (bnc #575056). +- 2.19.5 + +------------------------------------------------------------------- Fri Jan 22 15:23:18 CET 2010 - jsmeix(a)suse.de - Fixed search usability in basicadd.ycp and basicmodify.ycp -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61117 - in /trunk/printer: VERSION package/yast2-printer.changes src/Printer.ycp
by jsmeix＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: jsmeix Date: Wed Mar 3 12:16:00 2010 New Revision: 61117 URL: http://svn.opensuse.org/viewcvs/yast?rev=61117&view=rev Log: Undoing change committed in r303. Modified: trunk/printer/VERSION trunk/printer/package/yast2-printer.changes trunk/printer/src/Printer.ycp Modified: trunk/printer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/VERSION?rev=61117&r1=611… ============================================================================== --- trunk/printer/VERSION (original) +++ trunk/printer/VERSION Wed Mar 3 12:16:00 2010 @@ -1 +1 @@ -2.19.6 +2.19.5 Modified: trunk/printer/package/yast2-printer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/package/yast2-printer.ch… ============================================================================== --- trunk/printer/package/yast2-printer.changes (original) +++ trunk/printer/package/yast2-printer.changes Wed Mar 3 12:16:00 2010 @@ -1,10 +1,4 @@ ------------------------------------------------------------------- -Wed Mar 3 10:15:03 CET 2010 - mzugec(a)suse.cz - -- start cups service when export AY profile (bnc#582680) -- 2.19.6 - -------------------------------------------------------------------- Fri Jan 22 15:23:18 CET 2010 - jsmeix(a)suse.de - Fixed search usability in basicadd.ycp and basicmodify.ycp Modified: trunk/printer/src/Printer.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/printer/src/Printer.ycp?rev=6111… ============================================================================== --- trunk/printer/src/Printer.ycp (original) +++ trunk/printer/src/Printer.ycp Wed Mar 3 12:16:00 2010 @@ -39,8 +39,6 @@ import "Summary"; import "Popup"; import "Printerlib"; -import "Mode"; -import "Service"; /** * Prototypes @@ -724,12 +722,6 @@ sleep( 500 ); if( Abort() ) return false; Progress::Finish(); - - if (Mode::mode() == "autoinst_config"){ - y2milestone("Starting CUPS service because of autoyast configuration."); - if (Service::Status("cups") != 0) Service::Start("cups"); - } - return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61116 - in /branches/SuSE-Code-11-SP1-Branch/storage: libstorage/src/Storage.cc package/yast2-storage.changes
by aschnell＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: aschnell Date: Wed Mar 3 11:30:55 2010 New Revision: 61116 URL: http://svn.opensuse.org/viewcvs/yast?rev=61116&view=rev Log: - wait for device before zeroing it (bnc #584683) Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Modified: branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/libstorage/src/Storage.cc Wed Mar 3 11:30:55 2010 @@ -6738,6 +6738,8 @@ y2mil("device:" << device << " sizeK:" << sizeK << " random:" << random << " startK:" << startK << " endK:" << endK); + waitForDevice(device); + int ret = 0; const string source = (random ? "/dev/urandom" : "/dev/zero"); Modified: branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/stora… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/storage/package/yast2-storage.changes Wed Mar 3 11:30:55 2010 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Mar 03 11:28:56 CET 2010 - aschnell(a)suse.de + +- wait for device before zeroing it (bnc #584683) + +------------------------------------------------------------------- Tue Mar 02 11:56:55 CET 2010 - aschnell(a)suse.de - fixed position of new entries in fstab (bnc #584553) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r61115 - /trunk/autoinstallation/src/clients/inst_autosetup.ycp
by ug＠svn.opensuse.org 03 Mar '10

03 Mar '10

Author: ug Date: Wed Mar 3 10:56:04 2010 New Revision: 61115 URL: http://svn.opensuse.org/viewcvs/yast?rev=61115&view=rev Log: Storage::SetImsmDriver removed Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp Modified: trunk/autoinstallation/src/clients/inst_autosetup.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/autoinstallation/src/clients/ins… ============================================================================== --- trunk/autoinstallation/src/clients/inst_autosetup.ycp (original) +++ trunk/autoinstallation/src/clients/inst_autosetup.ycp Wed Mar 3 10:56:04 2010 @@ -219,15 +219,6 @@ // recognize this now Storage::ReReadTargetMap(); -/* too late for this - Storage::SetImsmDriver( `IMSM_DMRAID ); - foreach( map drive, Profile::current["partitioning"]:[], ``{ - if( haskey( drive, "imsmdriver" ) ) { - Storage::SetImsmDriver( drive["imsmdriver"]:`IMSM_DMRAID ); // bnc#574270 - } - }); -*/ - // No partitioning in the profile means yast2-storage proposal (hmmmm.....) if( size(Profile::current["partitioning"]:[]) > 0 ) { AutoinstStorage::Import(Profile::current["partitioning"]:[]); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0