July 2011 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r64923 - in /trunk/network: VERSION package/yast2-network.changes src/clients/firewall_stage1_finish.ycp src/clients/firewall_stage1_proposal.ycp
by locilka＠svn2.opensuse.org 21 Jul '11

21 Jul '11

Author: locilka Date: Thu Jul 21 13:48:48 2011 New Revision: 64923 URL: http://svn.opensuse.org/viewcvs/yast?rev=64923&view=rev Log: - Fixed Firewall and SSH proposal to be still able to adjust SSH independently on the firewall status (bnc#537980). - 2.20.13 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/firewall_stage1_finish.ycp trunk/network/src/clients/firewall_stage1_proposal.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=64923&r1=649… ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jul 21 13:48:48 2011 @@ -1 +1 @@ -2.20.12 +2.20.13 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.ch… ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jul 21 13:48:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 21 13:44:24 CEST 2011 - locilka(a)suse.cz + +- Fixed Firewall and SSH proposal to be still able to adjust SSH + independently on the firewall status (bnc#537980). +- 2.20.13 + +------------------------------------------------------------------- Fri Jul 1 13:42:16 CEST 2011 - mvidner(a)suse.cz - Proofread texts for translation (by A.Turrini, bnc#703190). Modified: trunk/network/src/clients/firewall_stage1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Thu Jul 21 13:48:48 2011 @@ -28,20 +28,21 @@ y2debug("func=%1", func); y2debug("param=%1", param); +//we have those from the proposal +boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); +boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); + if (func == "Info") { return (any)$[ "steps" : 1, // progress step title "title" : _("Writing Firewall Configuration..."), - "when" : SuSEFirewallProposal::GetChangedByUser() ? [ `installation, `autoinst ] : [], + "when" : (SuSEFirewallProposal::GetChangedByUser() || ssh_enabled) ? [ `installation, `autoinst ] : [], ]; } else if (func == "Write") { - //we have those from the proposal - boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); - boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1", fw_enabled ? sformat("enabled, ssh port will be %1", ssh_enabled ? "open" : "closed") : "disabled"); Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_sta… ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Thu Jul 21 13:48:48 2011 @@ -127,8 +127,6 @@ SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); } - SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); - SuSEFirewallProposal::SetProposalInitialized(true); } @@ -147,27 +145,23 @@ _("Firewall will be disabled (<a href=\"firewall--enable_firewall_in_proposal\">enable</a>)") ) + "</li>\n"; - if (SuSEFirewall4Network::Enabled1stStage()) - { - output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") - : - _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") - ) + "</li>\n"; + output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? + _("SSH service will be enabled, SSH port will be open (<a href=\"firewall--disable_ssh_in_proposal\">disable and close</a>)") + : + _("SSH service will be disabled, SSH port will be blocked (<a href=\"firewall--enable_ssh_in_proposal\">enable and open</a>)") + ) + "</li>\n"; - } output = output + "</ul>\n"; ret = $[ - "preformatted_proposal" : output, - "warning_level" : `warning, - //"warning" : proposal["warning"]:nil, - "links" : [ - "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", - "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", - ] - ]; - + "preformatted_proposal" : output, + "warning_level" : `warning, + //"warning" : proposal["warning"]:nil, + "links" : [ + "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", + "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", + ] + ]; } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]:nil; -- 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] r64922 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:52:31 2011 New Revision: 64922 URL: http://svn.opensuse.org/viewcvs/yast?rev=64922&view=rev Log: correct upper case Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 14:52:31 2011 @@ -123,8 +123,8 @@ should be created and if DCB is required." ) + /* Edit dialog help 3/3 */ _( "The values are: - FCoE enable: yes or no Enable or disable creation of FCoE. - DCB required: yes or no The default is yes, DCB is usually + FCoE Enable: yes or no Enable or disable creation of FCoE. + DCB Required: yes or no The default is yes, DCB is usually required." ), ]; -- 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] r64921 - in /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src: complex.ycp dialogs.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:47:30 2011 New Revision: 64921 URL: http://svn.opensuse.org/viewcvs/yast?rev=64921&view=rev Log: improve layout of edit dialog Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/complex.ycp Wed Jul 20 14:47:30 2011 @@ -233,6 +233,7 @@ // set values for 'FCoE Enabled' and 'DCB Required' UI::ChangeWidget( `id(`fcoe), `Value, card["fcoe_enable"]:"" ); UI::ChangeWidget( `id(`dcb), `Value, card["dcb_required"]:"" ); + // headline of the edit dialog - configuration of values for a certain network interface UI::ChangeWidget( `id(`heading), `Value, sformat( _("Configuration of Interface %1"), card["fcoe_vlan"]:"" ) ); } Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Wed Jul 20 14:47:30 2011 @@ -64,23 +64,26 @@ return `VBox( `VStretch(), // heading is replaced later (InitEditDialog) - `Label( `id(`heading), ("Configuration of Interface ................................") ), + `Label( `id(`heading), ("Configuration of Interface .......................") ), + `VSpacing(2), `HBox ( `HStretch(), `Frame( (""), - `VBox( - `VSpacing(2), - `ComboBox( `id(`fcoe), _("FCoE Enable"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2), - `ComboBox( `id(`dcb), _("DCB Required"), - [`item(`id("yes"), "yes" ), - `item(`id("no"), "no", true ) ] - ), - `VSpacing (2) - ) + `MarginBox( 10, 2, + `VBox( + `VSpacing(2), + `ComboBox( `id(`fcoe), _("FCoE Enable"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2), + `ComboBox( `id(`dcb), _("DCB Required"), + [`item(`id("yes"), "yes" ), + `item(`id("no"), "no", true ) ] + ), + `VSpacing (2) + ) + ) ), `HStretch() ), -- 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] r64920 - /branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:13:56 2011 New Revision: 64920 URL: http://svn.opensuse.org/viewcvs/yast?rev=64920&view=rev Log: removed duplicated *.changes entry Modified: branches/SuSE-Code-11-SP1-Branch/wagon/package/yast2-wagon.changes 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 Jul 20 14:13:56 2011 @@ -8,7 +8,6 @@ - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) -- do not allow to continue without package lock (BNC #616982) - 2.17.17.1 ------------------------------------------------------------------- -- 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] r64919 - in /branches/SuSE-Code-11-SP1-Branch/wagon: ./ package/ src/clients/ src/config/ src/include/ src/modules/ testsuite/tests/
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 14:05:51 2011 New Revision: 64919 URL: http://svn.opensuse.org/viewcvs/yast?rev=64919&view=rev Log: backport from SP2 branch: - added new core/full migration selection dialog (fate#311994) - if the system is managed by SUSE Manager display a message and exit (fate#311994) - added a new client for selecting DUP repositories (fate#311994) - added a new client for checking registration status before starting migration (fate#309594) - implemented download in advance mode support (fate#308951) - 2.17.17.1 Added: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_dup_repositories.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_dup_repositories.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_check.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/clients/wagon_registration_check.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/include/wagon_helpers.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/include/wagon_helpers.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/RegistrationStatus.pm - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/src/modules/RegistrationStatus.pm branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.err - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.err branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.out - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.out branches/SuSE-Code-11-SP1-Branch/wagon/testsuite/tests/FindMountPoint.ycp - copied unchanged from r64915, branches/SuSE-Code-11-SP2-Branch/wagon/testsuite/tests/FindMountPoint.ycp Modified: branches/SuSE-Code-11-SP1-Branch/wagon/ (props changed) 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_registration_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/src/config/online_migration.xml branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Wagon.ycp branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in 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 Jul 20 14:05:51 2011 @@ -1 +1 @@ -2.17.18 +2.17.17.1 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 Jul 20 14:05:51 2011 @@ -1,8 +1,20 @@ ------------------------------------------------------------------- +Wed Jul 20 11:45:47 UTC 2011 - lslezak(a)suse.cz + +- added new core/full migration selection dialog (fate#311994) +- if the system is managed by SUSE Manager display a message + and exit (fate#311994) +- added a new client for selecting DUP repositories (fate#311994) +- added a new client for checking registration status before + starting migration (fate#309594) +- implemented download in advance mode support (fate#308951) +- do not allow to continue without package lock (BNC #616982) +- 2.17.17.1 + +------------------------------------------------------------------- Mon Jan 3 15:32:13 CET 2011 - locilka(a)suse.cz - Do not allow to continue without package lock (BNC #616982) -- 2.17.18 ------------------------------------------------------------------- Mon Mar 15 13:28:41 CET 2010 - locilka(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_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_registration_handler.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_registration_handler.ycp Wed Jul 20 14:05:51 2011 @@ -57,6 +57,16 @@ return sort (ret); } + list<string> AddedRepos(list<string> prev, list<string> curr) + { + list<string> ret = []; + + // added repos = all current which were not in the previous state + ret = filter(string curr_repo, curr, {return !contains(prev, curr_repo);}); + + return ret; + } + // all repository aliases list <string> all_repos = GetCurrentlyEnabledReposByAlias(); y2milestone ("Currently registered repositories: %1", all_repos); @@ -91,7 +101,13 @@ list <string> current_repos = GetCurrentlyEnabledReposByAlias(); if (all_repos != current_repos) { Wagon::repos_already_registered = true; + + // remember the added repositories + list<string> added = AddedRepos(all_repos, current_repos); + Wagon::SetRegistrationRepos(added); + y2milestone ("List of repositories has changed: %1", current_repos); + y2milestone("Added repositories: %1", added); break; } Modified: 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 (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_repositories_handler.ycp Wed Jul 20 14:05:51 2011 @@ -41,7 +41,7 @@ // Mode::SetMode ("normal"); y2milestone ("Running repositories..."); ret = (symbol) WFM::call ("repositories"); - y2milestone ("Script inst_suse_register returned: %1", ret); + y2milestone ("Script repositories returned: %1", ret); // Mode::SetMode ("update"); if (ret == `cancel || ret == `abort) { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.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_proposal.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/wagon_update_proposal.ycp Wed Jul 20 14:05:51 2011 @@ -20,6 +20,7 @@ import "Wagon"; import "Report"; + import "PackageInstallation"; string func = (string) WFM::Args(0); map param = (map) WFM::Args(1); @@ -40,11 +41,23 @@ } Wagon::ProposeDUP(); + Wagon::ProposeDownloadMode(); ret = Wagon::ProposalSummary(); } else if (func == "AskUser") { - Report::Message (_("There is nothing to set.")); + string chosen_id = param["chosen_id"]:""; + + // toggle the download mode status + if (chosen_id == Wagon::GetDownloadModeLink()) + { + PackageInstallation::SetDownloadInAdvance(!PackageInstallation::DownloadInAdvance()); + } + else + { + Report::Message (_("There is nothing to set.")); + } + ret = $[ "workflow_sequence" : `next ]; } else if (func == "Description") { Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/clients/welcome_in_wagon.ycp Wed Jul 20 14:05:51 2011 @@ -21,6 +21,7 @@ import "Popup"; import "Wagon"; import "Report"; + import "FileUtils"; textdomain "wagon"; @@ -41,6 +42,18 @@ GetInstArgs::enable_back(), GetInstArgs::enable_next()); Wizard::EnableAbortButton (); + // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE Manager + if (FileUtils::Exists("/etc/sysconfig/rhn/systemid")) + { + y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon"); + + // warning message, system managed by SUSE Manager cannot be migrated by wagon + // display this message and exit + Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit.")); + + return (any)`back; + } + any ret = nil; while (true) { 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 Jul 20 14:05:51 2011 @@ -28,10 +28,13 @@ <name>running_by_applet</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module> <module>suse_register_workflow</module> + <module>wagon_dup_repositories</module> <module>wagon_modify_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -55,14 +58,17 @@ <name>manual</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>update_online_mechanism</module> <module>install_migration_products</module>  <module>update_url_dialog</module> <module>suse_register_workflow</module> <module>wagon_manual_url_repositories</module> + <module>wagon_dup_repositories</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> @@ -84,8 +90,11 @@ <name>PatchCD</name> <modules config:type="list"> <module>welcome</module> + <module>registration_check</module> <module>wagon_custom_url</module> <module>wagon_selfupdate_from_url</module> + <module>wagon_dup_repositories</module> + <module>prepare_progress</module> <module>point_of_no_return</module> <module>wagon_kickoff</module> @@ -162,6 +171,12 @@ <enable_back>no</enable_back> </module> + <module> + <label>Registration Check</label> + <name>registration_check</name> + <execute>wagon_registration_check</execute> + </module> +  <module> <label>Renew Update Stack</label> @@ -244,6 +259,12 @@ </module> <module> + <label>Migration Configuration</label> + <name>wagon_dup_repositories</name> + <execute>wagon_dup_repositories</execute> + </module> + + <module> <heading>yes</heading> <label>Migration</label> </module> Modified: branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/src/modules/Makefile.am Wed Jul 20 14:05:51 2011 @@ -2,8 +2,16 @@ # Makefile.am for wagon/src/modules # -module_DATA = $(wildcard *.ycp) +module_DATA = Wagon.ycp RegistrationStatus.pm EXTRA_DIST = $(module_DATA) +YCPCFLAGS = -I . + +ycpchook = wagon + +wagon: + ln -s ../include wagon + + include $(top_srcdir)/Makefile.am.common 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 Jul 20 14:05:51 2011 @@ -31,6 +31,11 @@ import "Update"; import "FileUtils"; import "String"; + import "Packages"; + import "PackageInstallation"; + import "RegistrationStatus"; + + include "wagon/wagon_helpers.ycp"; boolean running_by_applet = false; @@ -75,6 +80,13 @@ return update_workflow_type; } + const string download_mode_link = "wagon-download_in_advance"; + + global define string GetDownloadModeLink() + { + return download_mode_link; + } + string migration_method = nil; global string migration_method_file = sformat ("%1/wagon_migration_method", Directory::vardir); @@ -98,6 +110,35 @@ return migration_method; } + // do the distribution upgrade from selected repositories + list<integer> dup_repos = []; + + global list<integer> DupRepos() + { + return dup_repos; + } + + global void SetDupRepos(list<integer> repos) + { + dup_repos = repos; + } + + // list of repositories (aliases) added by suse_register + list<string> new_registration_repos = []; + + // returns list of repositories (aliases) added by suse_register + global list<string> RegistrationRepos() + { + return new_registration_repos; + } + + // set list of repositories (aliases) added by suse_register + global void SetRegistrationRepos(list<string> repos) + { + y2milestone("Repositories added by registration: %1", new_registration_repos); + new_registration_repos = repos; + } + void ResetWorkflowSteps () { ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage()); } @@ -369,16 +410,100 @@ return true; } - map <string, any> update_conf = GetUpdateConf(); + // reset upgrade repo config + y2milestone("Resetting upgrade repos config"); + list<integer> repos = Pkg::GetUpgradeRepos(); + foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);}); + + // all repositories selected for upgrade? + if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos)) + { + // reset solver flags (needed when switching from full DUP to partial DUP + Pkg::SetSolverFlags($["reset" : true]); + + // do full distribution upgrade + map <string, any> update_conf = GetUpdateConf(); + map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); + y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + } + else + { + // do partial DUP + // add upgrade repositories + y2milestone("Adding upgrade repos: %1", dup_repos); + foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);}); + + // be compatible with "zypper dup --from" + Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]); + } - map <symbol, integer> update_sum = Pkg::PkgUpdateAll (update_conf); - y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum); + Pkg::PkgSolve(true); already_proposed = true; return true; } + map<string, any> CheckDownloadSpace() + { + // display a warning if estimated free size after migration is below 100MB + integer min_free_space = 100 << 20; + + map<string, list> du = Pkg::TargetGetDU(); + list<string> mounts = maplist(string dir, list info, du, {return dir;}); + + map<string,any> zconfig = Pkg::ZConfig(); + string pkg_path = zconfig["repo_packages_path"]:""; + + string packages_mount = FindMountPoint(pkg_path, mounts); + y2milestone("Packages will we downloaded to %1 (mountpoint %2)", pkg_path, packages_mount); + + // download size in bytes + integer download_size = Packages::CountSizeToBeDownloaded(); + y2milestone("Size of packages to download: %1MB", download_size >> 20); + + // du contains maps: $[ "dir" : [ total, used, pkgusage, readonly ], .... ] + integer after_install = du[packages_mount, 2]:0; + integer total = du[packages_mount, 0]:0; + y2milestone("Size after installation: %1MB (of %2MB)", after_install >> 20, total >> 20); + + symbol result = `ok; + string message = ""; + + if (after_install + download_size < total) + { + result = `error; + message = sformat(_("There is not enough free space to migrate the system using download in advance mode. Partition %1 needs at least %2MB more free disk space. (The needed size is estimated, it is recommended to add slightly more free space.) Add more disk space or disable download in advance mode."), + packages_mount, (after_install + download_size - total) >> 20); + y2error("Not enough free space for download in advance upgrade: " + + "estimated size after installation: %1MB, download size: %2MB, " + + "total size: %3MB, estimated free space: %4MB", after_install >> 20, + download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + else if (after_install + download_size + min_free_space < total) + { + result = `warning; + message = sformat(_("There might not be enough free space for download in advance mode migration. The estimated free space after migration is %2MB, it is recommended to increase the free space in case the estimation is inaccurate to avoid installation errors."), + (total - after_install - download_size) >> 20); + y2warning("Low free space: estimated size after installation: %1MB, " + + "download size: %2MB, total size: %3MB, estimated free space: %4MB", + after_install >> 20, download_size >> 20, total >> 20, (total - after_install - download_size) >> 20); + } + + return $[ "result" : result, "message" : message ]; + } + + global void ProposeDownloadMode() + { + if (PackageInstallation::DownloadInAdvance() == nil) + { + map<string, any> dwspace = CheckDownloadSpace(); + + PackageInstallation::SetDownloadInAdvance(dwspace["result"]:nil == `ok); + y2milestone("Proposed download in advance mode: %1", PackageInstallation::DownloadInAdvance()); + } + } + global map <string,any> MinimizeProductMap (map <string,any> product) { if (haskey (product, "license")) product["license"] = "..."; if (haskey (product, "description")) product["description"] = "..."; @@ -510,9 +635,14 @@ ret = "<ul>\n" + ret + "</ul>\n"; + ret = ret + "<ul><li>\n" + _("Download all packages before upgrade: ") + + sformat("<a href=\"%1\">%2</a>", download_mode_link, (PackageInstallation::DownloadInAdvance() ? _("Enabled") : _("Disabled"))) + + "</li></ul>\n"; + map <string, any> summary = $[ "preformatted_proposal" : ret, - // help text + "links" : [ download_mode_link ], + // help text, TODO FIXME: replace the inner by "help" : _("To change the update settings, go to Packages Proposal section."), ]; @@ -630,5 +760,131 @@ return true; } + + /* + * Read registration status and sort products according their status + * @param file Read this registration status file + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatusFromFile(string file) + { + boolean registered_system = true; + integer timestamp = -1; + + list<string> failed = []; + list<string> no_subscription = []; + list<string> expired = []; + list<string> rma = []; + list<string> provisional = []; + list<string> registered = []; + + // 0 = empty file, -1 = missing + if (FileUtils::GetSize(file) <= 0) + { + y2milestone("File %1 does not exist", file); + registered_system = false; + } + else + { + // read the registration status + // see https://wiki.innerweb.novell.com/index.php/Registration#Add_Registration_St… + // for more datils about the file format + map status = RegistrationStatus::ReadFile(file); + + timestamp = tointeger(status["generated"]:"-1"); + list<map> products = status["productstatus"]:[]; + + // check each product + foreach(map product, products, + { + string product_name = product["product"]:""; + + // not registered (error present, but not "expired") + if (product["result"]:"" == "error" && product["errorcode"]:"" != "ERR_SUB_EXP") + { + failed = add(failed, product_name); + } + else + { + // registered, but subscription is not needed (e.g. SLES-SDK) + if (product["subscription"]:$[] == $[]) + { + no_subscription = add(no_subscription, product_name); + } + else + { + string status = product["subscription", "status"]:""; + string expiration = product["subscription", "expiration"]:""; + + // expired subscription (status == EXPIRED or the timestamp is in the past) + if (status == "EXPIRED" || (expiration != "" && tointeger(expiration) < time())) + { + expired = add(expired, product_name); + } + else if (status == "RMA") + { + rma = add(rma, product_name); + } + else + { + string type = product["subscription", "type"]:""; + + // provisional subscription + if (type == "PROVISIONAL") + { + provisional = add(provisional, product_name); + } + else + { + registered = add(registered, product_name); + } + } + } + } + } + ); + } + + return $[ + "registered_system" : registered_system, + "timestamp" : timestamp, + "registered" : registered, + "provisional" : provisional, + "rma" : rma, + "expired" : expired, + "no_subscription" : no_subscription, + "failed" : failed + ]; + + } + + /* + * Read registration status from /var/lib/suseRegister/registration-status.xml and sort products according their status + * @return map<string,any> result: $[ + * + "registered_system" : (boolean) - true registration was run, false registration has never run or there is no product to register (e.g. openSUSE installation) or the registration completely failed + "timestamp" : (integer) - time when the status was saved (unix time), -1 in an unregistered system + "registered" : (list<string>) - registered products + "provisional" : (list<string>) - products with provisional subscription (registered, but no updates available) + "rma" : (list<string>) - refunded subscriptions, not active anymore + "expired" : (list<string>) - expired subscriptions + "no_subscription" : (list<string>) - products which do not need a subscription (e.g. SLES-SDK) + "failed" : (list<string>) - registration failed (e.g. invalid registration code) + * ] + */ + global define map<string,any> RegistrationStatus() + { + return RegistrationStatusFromFile(RegistrationStatus::RegFile()); + } /* EOF */ } Modified: branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/wagon… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in (original) +++ branches/SuSE-Code-11-SP1-Branch/wagon/yast2-wagon.spec.in Wed Jul 20 14:05:51 2011 @@ -4,11 +4,17 @@ # PackagesUI::RunPackageSelector Requires: yast2 >= 2.17.40 Requires: yast2-online-update-frontend >= 2.17.9 -# <upgrades> section from product file -Requires: yast2-pkg-bindings >= 2.17.44 +# Pkg::AddUpgradeRepo() +Requires: yast2-pkg-bindings >= 2.17.45.1 +# Pkg::AddUpgradeRepo() +BuildRequires: yast2-pkg-bindings >= 2.17.45.1 + +BuildRequires: perl-XML-Simple +Requires: perl-XML-Simple # Called in proposal and in code -Requires: yast2-packager yast2-add-on +Requires: yast2-packager >= 2.17.78.1 +Requires: yast2-add-on # Counting packages directly in packages proposal (BNC #573482) Requires: yast2-update >= 2.17.19 @@ -47,6 +53,7 @@ @clientdir@/*.ycp @moduledir@/*.ycp @moduledir@/*.ybc +@moduledir@/*.pm %dir @yncludedir@/wagon @yncludedir@/wagon/*.ycp %dir /usr/share/YaST2/control -- 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] r64918 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 14:01:33 2011 New Revision: 64918 URL: http://svn.opensuse.org/viewcvs/yast?rev=64918&view=rev Log: only start with tab interfaces if both services are enabled Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/wizards.ycp Wed Jul 20 14:01:33 2011 @@ -121,7 +121,7 @@ ]; map <string, boolean> status_map = FcoeClient::GetStartStatus(); - if ( status_map["fcoe"]:false == true || status_map["lldpad"]:false == true ) + if ( status_map["fcoe"]:false == true && status_map["lldpad"]:false == true ) ini_tab = "interfaces"; else ini_tab = "services"; -- 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] r64917 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:46:50 2011 New Revision: 64917 URL: http://svn.opensuse.org/viewcvs/yast?rev=64917&view=rev Log: more initial space for head line Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/dialogs.ycp Wed Jul 20 13:46:50 2011 @@ -64,7 +64,7 @@ return `VBox( `VStretch(), // heading is replaced later (InitEditDialog) - `Label( `id(`heading), ("Configuration of Interface ...................") ), + `Label( `id(`heading), ("Configuration of Interface ................................") ), `HBox ( `HStretch(), `Frame( (""), -- 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] r64916 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:46:29 2011 New Revision: 64916 URL: http://svn.opensuse.org/viewcvs/yast?rev=64916&view=rev Log: more improvements of help text Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 13:46:29 2011 @@ -78,26 +78,26 @@ /* Services dialog help 1/3 */ "services" : _("<big>Starting of services</big> There is the possibility to enable or disable the start of the services -fcoe and lldpad at boot time. +fcoe and lldpad at boot time. ") + /* Services dialog help 2/3 */ - _("Starting the service fcoe means starting the Fibre Channel over -Ethernet service daemon 'fcoemon' which controls the FCoE interfaces and -establishes a connection with the daemon 'lldpad'." ) + + _("Starting the service fcoe means starting the Fibre Channel over +Ethernet service daemon fcoemon which controls the FCoE interfaces and +establishes a connection with the daemon lldpad." ) + /* Services dialog help 3/3 */ - _("The lldpad service provides the Link Layer Discovery Protocol agent daemon 'lldpad' which informs 'fcoemon' about DCB (Data Center Bridging) features and configuration of the interfaces."), + _("The lldpad service provides the Link Layer Discovery Protocol agent daemon lldpad which informs fcoemon about DCB (Data Center Bridging) features and configuration of the interfaces."), /* Interfaces dialog help 1/4 */ "interfaces" : _("<big>Network interface overview</big> ") + /* Interfaces dialog help 2/4 */ -_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column 'FCoE VLAN interface'.") + +_("The interfaces dialog shows all detected netcards including the status of VLAN and FCoE configuration. FCoE is possible if a VLAN interface is configured for FCoE on the switch. For every netcard (network interface) this is shown in column FCoE VLAN interface.") + /* Interfaces dialog help 3/4 */ _("The values for FCoE VLAN Interface in detail: -not available means, FCoE isn't possible (must be enabled on the switch first) -not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. +not available: Fibre Channel over Ethernet isn't possible (must be enabled on the switch first) +not configured: FCoE is possible but not yet activated, press Create FCoE VLAN Interface to do this. If the FCoE VLAN interface is already created the name is shown in the column, e.g. eth3.200.") + /* Interfaces dialog help 3/4 */ @@ -111,20 +111,20 @@ /* Configuration dialog help 3/3 */ _("The values are: -Debug: yes or no is used to enable debugging messages from the fcoe service script and 'fcoemon' -Use syslog: yes or no sends messages to the system log if set to yes (see /var/log/messages)."), +Debug: yes or no is used to enable debugging messages from the fcoe service script and fcoemon +Use syslog: yes or no sends messages to the system log if set to yes (data are logged to /var/log/messages)."), /* edit dialog help 1/3 */ "change" : _("Edit settings in /etc/fcoe/ethx" ) + /* Edit dialog help 2/3 */ - _( "The daemon 'fcoemon' reads these configuration files on initialization. + _( "The daemon fcoemon reads these configuration files on initialization. There is a file for every interface and the values indicate whether FCoE instances should be created and if DCB is required." ) + /* Edit dialog help 3/3 */ _( "The values are: - FCoE enable: yes or no Enable or disable creation of FCoE. - DCB required: yes or no The default is yes, DCB is usually + FCoE enable: yes or no Enable or disable creation of FCoE. + DCB required: yes or no The default is yes, DCB is usually required." ), ]; -- 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] r64915 - /branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp
by gs＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: gs Date: Wed Jul 20 13:15:55 2011 New Revision: 64915 URL: http://svn.opensuse.org/viewcvs/yast?rev=64915&view=rev Log: improve help text about service start Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Modified: branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/fcoe-… ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp (original) +++ branches/SuSE-Code-11-SP2-Branch/fcoe-client/src/helps.ycp Wed Jul 20 13:15:55 2011 @@ -75,16 +75,19 @@ the configuration opens. "), - /* Services dialog help 1/2 */ + /* Services dialog help 1/3 */ "services" : _("<big>Starting of services</big> -There is the possibility to enable/disable the start of the services +There is the possibility to enable or disable the start of the services fcoe and lldpad at boot time. ") + + /* Services dialog help 2/3 */ + _("Starting the service fcoe means starting the Fibre Channel over +Ethernet service daemon 'fcoemon' which controls the FCoE interfaces and +establishes a connection with the daemon 'lldpad'." ) + - /* Services dialog help 2/2 */ -_("Check the appropriate button, e.g. if you want to start FCoE automatically at -boot time click on 'When booting' in 'FcoE' frame."), - + /* Services dialog help 3/3 */ + _("The lldpad service provides the Link Layer Discovery Protocol agent daemon 'lldpad' which informs 'fcoemon' about DCB (Data Center Bridging) features and configuration of the interfaces."), + /* Interfaces dialog help 1/4 */ "interfaces" : _("<big>Network interface overview</big> ") + -- 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] r64914 - in /branches/SuSE-Code-11-SP1-Branch/packager: VERSION package/yast2-packager.changes src/clients/repositories.ycp
by lslezak＠svn2.opensuse.org 20 Jul '11

20 Jul '11

Author: lslezak Date: Wed Jul 20 12:59:59 2011 New Revision: 64914 URL: http://svn.opensuse.org/viewcvs/yast?rev=64914&view=rev Log: reverted commit r62689 ("backported layout change for repository (bnc#510794)"), it should not go out as a maintenance update, it's for SP2 only adjusted version to 2.17.79.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp Modified: branches/SuSE-Code-11-SP1-Branch/packager/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/VERSION (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/VERSION Wed Jul 20 12:59:59 2011 @@ -1 +1 @@ -2.17.79.1 +2.17.78.1 Modified: branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/package/yast2-packager.changes Wed Jul 20 12:59:59 2011 @@ -5,13 +5,7 @@ libzypp mode (bnc#616708) (backported commits 62714, partly 54940) - support for download in advance mode in yast2-wagon (fate#308951) -- 2.17.79.1 - -------------------------------------------------------------------- -Wed Oct 27 10:14:52 CEST 2010 - mzugec(a)suse.cz - -- backported layout change for repository (bnc#510794) -- 2.17.79 +- 2.17.78.1 ------------------------------------------------------------------- Thu May 6 13:28:47 CEST 2010 - jsrain(a)suse.cz Modified: branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/packa… ============================================================================== --- branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp (original) +++ branches/SuSE-Code-11-SP1-Branch/packager/src/clients/repositories.ycp Wed Jul 20 12:59:59 2011 @@ -69,8 +69,6 @@ const string priority_label = _("&Priority"); - const string keeppackages_label = _("Keep Downloaded Packages"); - // current view: // selected service (or empty) if all services are selected string displayed_service = ""; @@ -209,7 +207,6 @@ "type" : generalData["type"]:"", "priority" : source["priority"]:default_priority, "service" : source["service"]:"", - "keeppackages" : source["keeppackages"]:false, ]; return out; @@ -265,14 +262,7 @@ string url = sformat (_("URL: %1"), raw_url); - string ret = sformat("%1<BIG>%2</BIG>%3%4", icon_tag, name, url, category); - - if (service != "") - { - ret = ret + sformat("%1", service); - } - - return ret; + return sformat("%1<BIG>%2</BIG>%3%4%5", icon_tag, name, url, category, service); } term repoInfoTerm(string name, string url, string category, string service) @@ -285,7 +275,7 @@ `Left(`Label(`id(`service), `opt(`hstretch), service)) ) : - `VSquash(`MinHeight(6, `RichText(`id(`repo_info), ""))); + `VSquash(`MinHeight(7, `RichText(`id(`repo_info), ""))); } void fillRepoInfo(integer index, map source, boolean repo_mode, string service_name) @@ -337,9 +327,8 @@ if (repo_mode) { - // priority and keeppackages are displayed only for repositories + // priority is displayed only for repositories UI::ChangeWidget (`id (`priority), `Value, info["priority"]:default_priority); - UI::ChangeWidget (`id (`keeppackages), `Value, info["keeppackages"]:false); } } @@ -508,7 +497,7 @@ // otherwise we will not get their details list<integer> added = newSources (sourceStatesIn, sourceStatesOut); list<integer> deleted = newSources (sourceStatesOut, sourceStatesIn); - boolean have_rug = !norug && (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0; + boolean have_rug = false; boolean any_changed = added != [] || deleted != []; // #217697 if (success && have_rug && any_changed) { UI::OpenDialog ( @@ -562,32 +551,28 @@ return success; } -list<term> buildList() +list<term> buildTree() { - list<term> ret = [ - `item(`id(`all_repositories), _("All repositories")), - `item(`id(`all_services), _("All services")) - ]; + list<term> ret = []; + + list<term> services_t = []; foreach(map<string,any> srv_state, serviceStatesOut, { - term t = `item(`id(srv_state["alias"]:""), sformat(_("Service '%1'"), srv_state["name"]:"")); - ret = add(ret, t); + term t = `item(`id(srv_state["alias"]:""), srv_state["name"]:""); + services_t = add(services_t, t); } ); - return ret; -} - -term RepoFilterWidget() -{ - // combobox label - return `ComboBox(`id(`service_filter), `opt(`notify), _("View"), buildList()); -} - -void UpdateCombobox() -{ - UI::ReplaceWidget(`id(`filter_rp), RepoFilterWidget()); + // alphabetically sort the repositories (by "name" key) + // TODO FIXME: use lsort +// repositories_t = sort(term repo1, term repo2, repositories_t, {y2internal("val: %1", repo1[1]:""); return repo1[1]:"" < repo2[1]:"";}); + + return [ + // true = open the node + `item(`id(`services), _("Services"), true, services_t), + `item(`id(`repositories), _("Repositories"), true, []) + ]; } // return table widget definition @@ -629,7 +614,6 @@ UI::ReplaceWidget(`id(`tabrp), TableWidget(repo_mode)); UI::ReplaceWidget(`id(`priorp), repo_mode ? `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority) : `Empty()); - UI::ReplaceWidget(`id(`keeppkg_rp), repo_mode ? `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label) : `Empty()); } void RemoveReposFromService(string service_alias) @@ -710,59 +694,74 @@ } term contents = - `VBox( - `Right(`ReplacePoint(`id(`filter_rp), RepoFilterWidget())), - `VWeight(1, `ReplacePoint(`id(`tabrp), TableWidget(repository_view))), - repoInfoTerm("", "", "", ""), - - // label - `Left (`Label (_("Properties"))), - - `HBox( - `HSquash( - `VBox( - // check box - `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), - // check box - `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))), - // check box - `Left(`ReplacePoint(`id(`keeppkg_rp), `CheckBox(`id(`keeppackages), `opt(`notify), keeppackages_label))) - ) + `HBox( + `Tree(`id(`tree), `opt(`notify), "", buildTree()), + `VBox( + `HBox( + `VSpacing(9), + `ReplacePoint(`id(`tabrp), TableWidget(repository_view)), + `HSpacing() ), - `HSpacing(1), - `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), - `HStretch() - ), - `VSpacing (0.4), - - (have_rug) ? - // Checkbox label - `Left (`CheckBox (`id (`zmdsync), _("Synchronize Changes with &ZENworks"), !norug && sync_zmd)) - : `Empty(), - - `HBox( - `PushButton (`id (`add), `opt(`key_F3), - Label::AddButton ()), - `PushButton(`id(`replace), `opt(`key_F4), - Label::EditButton ()), - `PushButton (`id(`delete), `opt(`key_F5), - Label::DeleteButton ()), - `HStretch (), - // push button label - `PushButton (`id (`key_mgr), _("&GPG Keys...")), - // menu button label - `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ - `item(`id(`refresh), refreshButtonLabel ), + `HBox ( + `HSpacing(0.35), + `HWeight (1, `Frame ("", + `HBox ( + `HSpacing (1), + `HWeight( 1, `VBox ( + repoInfoTerm("", "", "", ""), + // label + `Left (`Label (_("Properties"))), + // check box + `HBox( + `HSquash( + `VBox( + `Left (`CheckBox (`id (`enable), `opt(`notify), _("&Enabled"))), + // check box + `Left (`CheckBox (`id (`autorefresh), `opt(`notify), _("Automatically &Refresh"))) + ) + ), + `HSquash(`ReplacePoint(`id(`priorp), `IntField(`id(`priority), `opt(`notify), priority_label, 0, 200, default_priority))), + `HStretch() + ), + `VSpacing (0.4), + (have_rug) ? + `Left (`CheckBox (`id (`zmdsync), + // Checkbox label + _("Synchronize Changes with &ZENworks"), + !norug && sync_zmd)) + : `Empty() + )), + `HSpacing (0.4) + ) + )), + `HSpacing (1.35) + ), + `VSpacing(0.3), + `HBox( + `PushButton (`id (`add), `opt(`key_F3), + Label::AddButton ()), + `PushButton(`id(`replace), `opt(`key_F4), + Label::EditButton ()), + `PushButton (`id(`delete), `opt(`key_F5), + Label::DeleteButton ()), + `HStretch (), + `PushButton (`id (`key_mgr), _("&GPG Keys...")), // menu button label - `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), - // menu button label - `item(`id(`refresh_enabled), _("Refresh All &Enabled")) - ]) + `MenuButton (`id(`menu_button), `opt(`key_F6), _("Refresh"), [ + `item(`id(`refresh), refreshButtonLabel ), + // menu button label + `item(`id(`autorefresh_all), _("Refresh All Autor&efreshed")), + // menu button label + `item(`id(`refresh_enabled), _("Refresh All &Enabled")) + ]) + ), + `VSpacing( 0.5 ) ) ); // dialog caption string title = _("Configured Software Repositories"); +// string title = _("Media Containing the Software Repository"); // help string help_text = _(" @@ -816,21 +815,20 @@ help_text = help_text + _("Priority of a Repository Priority of a repository is an integer value between 0 (the highest priority) and 200 (the lowest priority). Default priority is 99. If a package is available in more repositories the repository with the highest priority is used."); - // help text, continued help_text = help_text + _("Use the tree displayed on the left side for navigation in repositories and services."); - // help text, continued - help_text = help_text + _("Keep Downloaded Packages Check this option to keep downloaded packages in a local cache so they can be reused later when the packages are reinstalled. If unchecked the downloaded packages are deleted after installation.") + _("The default local cache is located in directory /var/cache/zypp/packages, the location can be changed in /etc/zypp/zypp.conf file."); - Wizard::SetNextButton(`next, Label::OKButton() ); Wizard::SetAbortButton(`abort, Label::CancelButton() ); Wizard::SetContents(title, contents, help_text, false, true); - Wizard::HideBackButton(); + Wizard::DisableBackButton(); fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); + // set the current view to repositories + UI::ChangeWidget(`id(`tree), `CurrentItem, `repositories); + symbol input = nil; integer current = -1; @@ -925,23 +923,23 @@ // start the GPG key manager //RunGPGKeyMgmt(); } - else if (input == `service_filter) + else if (input == `tree) { - // handle the combobox events here... - any current_item = UI::QueryWidget(`id(`service_filter), `Value); + // handle tree events here... + any current_item = UI::QueryWidget(`id(`tree), `CurrentItem); // rebuild the dialog if needed - y2milestone("Current combobox item: %1", current_item); + y2milestone("Current tree item: %1", current_item); boolean update_table_widget = false; - if (current_item == `all_repositories) + if (current_item == `repositories) { update_table_widget = !repository_view || displayed_service != ""; y2milestone("Switching to repository view"); repository_view = true; displayed_service = ""; } - else if (current_item == `all_services) + else if (current_item == `services) { update_table_widget = repository_view; y2milestone("Switching to service view"); @@ -1108,8 +1106,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } else @@ -1145,8 +1143,8 @@ } ); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } @@ -1295,8 +1293,8 @@ fillTable(repository_view, displayed_service); fillCurrentRepoInfo(); - // refresh also the combobox widget - UpdateCombobox(); + // refresh also the tree widget + UI::ChangeWidget(`id(`tree), `Items, buildTree()); } } } @@ -1404,25 +1402,6 @@ y2error("Ignoring event `priority: the widget should NOT be displayed in service mode!"); } } - else if (input == `keeppackages) - { - if (repository_view) - { - // refresh the value in the table - boolean new_keep = (boolean)UI::QueryWidget(`id(`keeppackages), `Value); - y2internal("New keep packages option: %1", new_keep); - - sourceState[ "keeppackages" ] = new_keep; - sourceStatesOut[ global_current ] = sourceState; - - // do not refresh the item in the table - current = -1; - } - else - { - y2error("Ignoring event `keeppackages: the widget should NOT be displayed in service mode!"); - } - } else if (input != `table) { y2warning("Unknown user input: %1", input); @@ -1472,7 +1451,7 @@ } else { - selected_url_scheme = URL::Parse(SourceDialogs::GetURL())["scheme"]:""; + selected_url_scheme = URL::Parse(SourceDialogs::GetRawURL())["scheme"]:""; y2milestone("Selected URL scheme: %1", selected_url_scheme); if (selected_url_scheme == nil || selected_url_scheme == "") @@ -1509,7 +1488,7 @@ // main function - start the workflow symbol StartInstSource() { - have_rug = (integer)SCR::Read (.target.size, "/usr/bin/rug") >= 0; + have_rug = false; norug = !have_rug || (size(WFM::Args()) > 0 && WFM::Args(0) == "norug"); Wizard::CreateDialog(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0