Author: locilka Date: Fri May 18 17:26:10 2007 New Revision: 38044 URL: http://svn.opensuse.org/viewcvs/yast?rev=38044&view=rev Log: - System Update functionality is allowed only when product versions are matching (can have a different name). Non-matching product means no possibility for System Update. Modified: trunk/update/package/yast2-update.changes trunk/update/src/clients/update_proposal.ycp trunk/update/src/modules/Update.ycp Modified: trunk/update/package/yast2-update.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/package/yast2-update.changes?rev=38044&r1=38043&r2=38044&view=diff ============================================================================== --- trunk/update/package/yast2-update.changes (original) +++ trunk/update/package/yast2-update.changes Fri May 18 17:26:10 2007 @@ -3,7 +3,8 @@ - System Update icon is back in Control Center (#274064) - System Update functionality is allowed only when product versions - are matching (can have a different name). + are matching (can have a different name). Non-matching product + means no possibility for System Update. - Warning is printed when versions match but product names are different (#274064). - System Update temporarily renamed to 'FACTORY Update'. Modified: trunk/update/src/clients/update_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/clients/update_proposal.ycp?rev=38044&r1=38043&r2=38044&view=diff ============================================================================== --- trunk/update/src/clients/update_proposal.ycp (original) +++ trunk/update/src/clients/update_proposal.ycp Fri May 18 17:26:10 2007 @@ -414,10 +414,32 @@ "raw_proposal" : [] ]; } + // 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"]:""; + } + + // 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"]:""; + } + // when versions don't match and upgrade is not allowed (running system) if ((Update::installedVersion["version"]:"A" != Update::updateVersion["version"]:"B") && Update::disallow_upgrade) { - // proposal error - return $[ "warning" : _("Updating to another version is not supported from the running system."), + return $[ "warning" : sformat( + // TRANSLATORS: proposal error, %1 is the version of installed system + // %2 is the version being installed + _("Updating system to another version (%1 -> %2) is not supported on the running system.<br> +Please, boot from the installation media and use a normal upgrade +or disable installation sources of products with different versions."), + update_from, update_to + ), "warning_level" : `fatal, "raw_proposal" : [] ]; } Modified: trunk/update/src/modules/Update.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/update/src/modules/Update.ycp?rev=38044&r1=38043&r2=38044&view=diff ============================================================================== --- trunk/update/src/modules/Update.ycp (original) +++ trunk/update/src/modules/Update.ycp Fri May 18 17:26:10 2007 @@ -443,7 +443,11 @@ */ global define void fill_version_map (map & data) { - data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + if (data["name"]:"?" == "?" && data["version"]:"?" == "?") { + data["nameandversion"] = "?"; + } else { + data["nameandversion"] = data["name"]:"?" + " " + data["version"]:"?"; + } list <string> tmp0 = []; if (regexpmatch (data["version"]:"", " -")) { @@ -532,6 +536,7 @@ // get new product name integer num = size (Packages::theSources); + if (num <= 0) { y2error ("No source"); @@ -541,8 +546,35 @@ return false; } - map new_product = Pkg::SourceProductData (Packages::theSources[num-1]:0); - y2milestone ("First source product %1", new_product); + integer update_to_source = nil; + + // So-called System Update + if (Stage::normal()) { + foreach (integer source_id, Packages::theSources, { + map source_map = Pkg::SourceProductData(source_id); + + // source need to be described + if (source_map != $[]) { + if (source_map["productversion"]:"A" == installedVersion["version"]:"B") { + y2milestone ("Found matching product: %1", source_map); + // first valid product is selected + if (update_to_source == nil) + update_to_source = source_id; + } else { + y2error ("Found non-matching product: %1", source_map); + // every invalid product is selected + update_to_source = source_id; + } + } + }); + } + + // a fallback for Stage::normal(), default for !Stage::normal() + if (update_to_source == nil) update_to_source = Packages::theSources[num-1]:0; + + map new_product = Pkg::SourceProductData (update_to_source); + y2milestone ("Product to update to: %1 %2", update_to_source, new_product); + if (new_product == nil) { updateVersion["name"] = "?"; @@ -556,7 +588,12 @@ updateVersion["show"] = new_product["label"]:nil; if (updateVersion["show"]:nil == nil) { y2warning ("No \"label\" defined in product"); - updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + + if (new_product["productname"]:"?" == "?" && new_product["productversion"]:"?" == "?") { + updateVersion["show"] = "?"; + } else { + updateVersion["show"] = new_product["productname"]:"?" + " " + new_product["productversion"]:"?"; + } } updateVersion["name"] = new_product["label"]:new_product["productname"]:"?"; updateVersion["version"] = new_product["productversion"]:"?"; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org