Hello community,
here is the log from the commit of package yast2-update
checked in at Thu Apr 12 18:23:35 CEST 2007.
--------
--- yast2-update/yast2-update.changes 2007-04-05 11:42:59.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-update/yast2-update.changes 2007-04-11 18:23:18.000000000 +0200
@@ -1,0 +2,10 @@
+Wed Apr 11 16:34:50 CEST 2007 - locilka@suse.cz
+
+- Added icon into Update Options dialog.
+- Added help for Update Options summary proposal (#227265).
+- System upgrade is now forbidden, only system update is possible.
+- Upgrade based on patterns is now more visually understandable
+ (#227265).
+- 2.15.9
+
+-------------------------------------------------------------------
Old:
----
yast2-update-2.15.8.tar.bz2
New:
----
yast2-update-2.15.9.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-update.spec ++++++
--- /var/tmp/diff_new_pack.p26356/_old 2007-04-12 18:23:25.000000000 +0200
+++ /var/tmp/diff_new_pack.p26356/_new 2007-04-12 18:23:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-update (Version 2.15.8)
+# spec file for package yast2-update (Version 2.15.9)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-update
-Version: 2.15.8
+Version: 2.15.9
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-update-2.15.8.tar.bz2
+Source0: yast2-update-2.15.9.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-add-on yast2-devtools yast2-packager yast2-testsuite
Requires: yast2
@@ -51,7 +51,7 @@
Jiri Srain
%prep
-%setup -n yast2-update-2.15.8
+%setup -n yast2-update-2.15.9
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,13 @@
%doc %{prefix}/share/doc/packages/yast2-update
%changelog
+* Wed Apr 11 2007 - locilka@suse.cz
+- Added icon into Update Options dialog.
+- Added help for Update Options summary proposal (#227265).
+- System upgrade is now forbidden, only system update is possible.
+- Upgrade based on patterns is now more visually understandable
+ (#227265).
+- 2.15.9
* Thu Apr 05 2007 - locilka@suse.cz
- Always call Update::GetProductName translating fstab and
cryptotab.
++++++ yast2-update-2.15.8.tar.bz2 -> yast2-update-2.15.9.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.8/src/clients/inst_update.ycp new/yast2-update-2.15.9/src/clients/inst_update.ycp
--- old/yast2-update-2.15.8/src/clients/inst_update.ycp 2007-02-15 11:42:48.000000000 +0100
+++ new/yast2-update-2.15.9/src/clients/inst_update.ycp 2007-04-11 18:23:41.000000000 +0200
@@ -9,7 +9,7 @@
* Show checkboxes for software categories. Let the user select his software.
* if he want to UPGRADE his system.
*
- * $Id: inst_update.ycp 35065 2007-01-04 13:35:30Z locilka $
+ * $Id: inst_update.ycp 37403 2007-04-11 16:23:39Z locilka $
*/
{
@@ -69,13 +69,21 @@
// Build and show dialog
- string from_version = RootPart::GetInfoOfSelected (`name);
- string to_version = Update::updateVersion["show"]:_("Unknown");
+ string from_version = Update::installedVersion["show"]:_("Unknown");
+ string to_version = Update::updateVersion["show"]:_("Unknown");
+
+ string update_label = "";
+ if (from_version == to_version) {
+ // label showing to which version we are updating
+ update_label = sformat (_("Update to %1"), to_version);
+ } else {
+ // label showing from which version to which version we are updating
+ update_label = sformat (_("Update from %1 to %2"), from_version, to_version);
+ }
term contents = `HVSquash(
`VBox(
- // label showing from what version to what version we are updating
- `Left (`Label (sformat (_("Update from %1 to %2"), from_version, to_version))),
+ `Left (`Label (update_label)),
`VSpacing (1),
// frame title for update selection
`Frame( _("Update Mode"),
@@ -142,6 +150,7 @@
Wizard::OpenAcceptDialog ();
Wizard::SetContents (title, contents, helptext, (boolean) WFM::Args(0), (boolean) WFM::Args(1));
+ Wizard::SetTitleIcon ("yast-software");
// preset update/upgrade radio buttons properly
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-update-2.15.8/src/clients/update_proposal.ycp new/yast2-update-2.15.9/src/clients/update_proposal.ycp
--- old/yast2-update-2.15.8/src/clients/update_proposal.ycp 2007-04-05 11:00:47.000000000 +0200
+++ new/yast2-update-2.15.9/src/clients/update_proposal.ycp 2007-04-11 18:23:41.000000000 +0200
@@ -5,7 +5,7 @@
*
* Purpose: Let user choose update settings.
*
- * $Id: update_proposal.ycp 37330 2007-04-05 09:00:46Z locilka $
+ * $Id: update_proposal.ycp 37403 2007-04-11 16:23:39Z locilka $
*/
{
textdomain "update";
@@ -413,78 +413,83 @@
];
}
- if (true)
- {
- list available_base_selections = Update::GetBaseSelections ();
- if ((! Packages::using_patterns) && size (available_base_selections) == 0)
- {
- y2error ("No base selections available");
- // Can't find any software data, probably a installation media error
- // error message
- return $[ "warning" : _("Cannot read package data from installation media. Media error?"),
- "warning_level" : `blocker,
- "raw_proposal" : [] ];
- }
+ list available_base_selections = Update::GetBaseSelections ();
+ if ((! Packages::using_patterns) && size (available_base_selections) == 0) {
+ y2error ("No base selections available");
+ // Can't find any software data, probably a installation media error
+ // error message
+ return $[ "warning" : _("Cannot read package data from installation media. Media error?"),
+ "warning_level" : `blocker,
+ "raw_proposal" : [] ];
}
- if (Update::disallow_upgrade)
- {
- if (false) // FIXME
- {
- // proposal error
- return $[ "warning" : _("Updating to another version is not supported from the running system."),
- "warning_level" : `fatal,
- "raw_proposal" : [] ];
- }
+ // when versions don't match and upgrade is not allowed (running system)
+ if ((Update::installedVersion["show"]:"A" != Update::updateVersion["show"]:"B") && Update::disallow_upgrade) {
+ // proposal error
+ return $[ "warning" : _("Updating to another version is not supported from the running system."),
+ "warning_level" : `fatal,
+ "raw_proposal" : [] ];
}
- list<string> tmp = [];
+ // stores the proposal text output
+ string summary_text = "";
- tmp = Update::SelectedProducts ();
- // summary text (%1 is package selection)
-// tmp = add (tmp, sformat (_("Update to %1"), Update::updateVersion["nameandversion"]:"?"));
+ list <string> products = Update::SelectedProducts ();
+ if (products != nil) {
+ foreach (string one_product, products, {
+ // TRANSLATORS: proposal summary item, %1 is a product name
+ summary_text = summary_text + "<li>" + sformat (_("Update to %1"), one_product) + "</li>\n";
+ });
+ }
- if (Update::onlyUpdateInstalled)
- {
- // Proposal for backup during update
- tmp = add (tmp, _("Only Update Installed Packages"));
+ if (Update::deleteOldPackages) {
+ // Proposal for removing packages which are not maintained any more
+ summary_text = summary_text + "<li>" + _("Delete unmaintained packages") + "</li>\n";
}
- else
- {
- if (Packages::using_patterns)
- {
+
+ if (Update::onlyUpdateInstalled) {
+ // Proposal for backup during update
+ summary_text = summary_text + "<li>" + _("Only update installed packages") + "</li>\n";
+ } else {
+ if (Packages::using_patterns) {
list