Author: locilka Date: Wed Oct 31 13:27:31 2007 New Revision: 41673 URL: http://svn.opensuse.org/viewcvs/yast?rev=41673&view=rev Log: - installedVersion and updateVersion moved from 'Update' to 'Installation' YCP module to remove dependencies. Modified: trunk/update/src/clients/inst_update.ycp trunk/update/src/clients/update_proposal.ycp Modified: trunk/update/src/clients/inst_update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/inst_update.ycp?rev=41673&r1=41672&r2=41673&view=diff ============================================================================== --- trunk/update/src/clients/inst_update.ycp (original) +++ trunk/update/src/clients/inst_update.ycp Wed Oct 31 13:27:31 2007 @@ -20,7 +20,7 @@ import "RootPart"; import "Update"; import "Packages"; - + import "Installation"; // screen title for update options string title = _("Update Options"); @@ -69,8 +69,8 @@ // Build and show dialog - string from_version = Update::installedVersion["show"]:_("Unknown"); - string to_version = Update::updateVersion["show"]:_("Unknown"); + string from_version = Installation::installedVersion["show"]:_("Unknown"); + string to_version = Installation::updateVersion["show"]:_("Unknown"); string update_label = ""; if (from_version == to_version) { Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_proposal.ycp?rev=41673&r1=41672&r2=41673&view=diff ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Wed Oct 31 13:27:31 2007 @@ -448,22 +448,22 @@ // TRANSLATORS: unknown product (label) string update_from = _("Unknown product"); - if (Update::installedVersion["show"]:"" != "" && Update::installedVersion["show"]:"?" != "?") { - update_from = Update::installedVersion["show"]:""; - } else if (Update::installedVersion["version"]:"" != "" && Update::installedVersion["version"]:"?" != "?") { - update_from = Update::installedVersion["name"]:""; + if (Installation::installedVersion["show"]:"" != "" && Installation::installedVersion["show"]:"?" != "?") { + update_from = Installation::installedVersion["show"]:""; + } else if (Installation::installedVersion["version"]:"" != "" && Installation::installedVersion["version"]:"?" != "?") { + update_from = Installation::installedVersion["name"]:""; } // TRANSLATORS: unknown product (label) string update_to = _("Unknown product"); - if (Update::updateVersion["show"]:"" != "") { - update_to = Update::updateVersion["show"]:""; - } else if (Update::updateVersion["version"]:"" != "") { - update_to = Update::updateVersion["name"]:""; + if (Installation::updateVersion["show"]:"" != "") { + update_to = Installation::updateVersion["show"]:""; + } else if (Installation::updateVersion["version"]:"" != "") { + update_to = Installation::updateVersion["name"]:""; } // when versions don't match and upgrade is not allowed (running system) - if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { + if ((Installation::installedVersion["version"]:"A" != Installation::updateVersion["version"]:"B") && Update::disallow_upgrade) { return $[ "warning" : sformat( // TRANSLATORS: proposal error, %1 is the version of installed system // %2 is the version being installed @@ -479,14 +479,14 @@ string warning_message = nil; // when labels don't match - if (!Stage::initial() && (Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B")) { + if (!Stage::initial() && (Installation::installedVersion["show"]:"A" != Installation::updateVersion["show"]:"B")) { warning_message = sformat( // TRANSLATORS: proposal warning, both %1 and %2 are replaced with product names _("Warning: Updating from '%1' to '%2', products do not exactly match."), // TRANSLATORS: unknown product name - Update::installedVersion["show"]:_("Unknown product"), + Installation::installedVersion["show"]:_("Unknown product"), // TRANSLATORS: unknown product name - Update::updateVersion["show"]:_("Unknown product") + Installation::updateVersion["show"]:_("Unknown product") ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org