[yast-commit] r38044 - in /trunk/update: package/yast2-update.changes src/clients/update_proposal.ycp src/modules/Update.ycp
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
participants (1)
-
locilka@svn.opensuse.org