Hello community,
here is the log from the commit of package yast2-wagon for openSUSE:Factory
checked in at Tue Jul 12 14:03:25 CEST 2011.
--------
--- yast2-wagon/yast2-wagon.changes 2011-02-18 14:39:36.000000000 +0100
+++ yast2-wagon/yast2-wagon.changes 2011-07-01 12:54:00.000000000 +0200
@@ -1,0 +2,30 @@
+Fri Jul 1 08:52:27 UTC 2011 - lslezak@suse.cz
+
+- .spec file - fixed file list
+- 2.21.2
+
+-------------------------------------------------------------------
+Thu Jun 30 14:13:52 UTC 2011 - lslezak@suse.cz
+
+- fixed typos (bnc#702648), fixed help text for migration repo
+ selection dialog
+
+-------------------------------------------------------------------
+Wed Jun 22 14:40:00 UTC 2011 - lslezak@suse.cz
+
+- added a new client for selecting DUP repositories (fate#311994)
+- 2.21.1
+
+-------------------------------------------------------------------
+Thu Jun 16 14:41:31 UTC 2011 - lslezak@suse.cz
+
+- added a new client for checking registration status before
+ starting migration (fate#309594)
+
+-------------------------------------------------------------------
+Tue Jun 14 08:42:02 UTC 2011 - lslezak@suse.cz
+
+- implemented download in advance mode support (fate#308951)
+- 2.21.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-wagon-2.20.3.tar.bz2
New:
----
yast2-wagon-2.21.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-wagon.spec ++++++
--- /var/tmp/diff_new_pack.6YnT4N/_old 2011-07-12 14:02:32.000000000 +0200
+++ /var/tmp/diff_new_pack.6YnT4N/_new 2011-07-12 14:02:32.000000000 +0200
@@ -19,24 +19,30 @@
Name: yast2-wagon
-Version: 2.20.3
+Version: 2.21.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-wagon-2.20.3.tar.bz2
+Source0: yast2-wagon-2.21.2.tar.bz2
Prefix: /usr
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
Requires: yast2-online-update-frontend >= 2.17.9
-# BNC #571621, Returns <upgrades> section from product file
-Requires: yast2-pkg-bindings >= 2.19.1
+# Pkg::AddUpgradeRepo()
+Requires: yast2-pkg-bindings >= 2.21.2
+# Pkg::AddUpgradeRepo()
+BuildRequires: yast2-pkg-bindings >= 2.21.2
+
+BuildRequires: perl-XML-Simple
+Requires: perl-XML-Simple
# Called in proposal and in code
-Requires: yast2-packager yast2-add-on
+Requires: yast2-packager >= 2.21.2
+Requires: yast2-add-on
# Counting packages directly in packages proposal (BNC #573482)
Requires: yast2-update >= 2.18.7
@@ -68,7 +74,7 @@
through command line tools.
%prep
-%setup -n yast2-wagon-2.20.3
+%setup -n yast2-wagon-2.21.2
%build
%{prefix}/bin/y2tool y2autoconf
@@ -106,10 +112,11 @@
/usr/share/YaST2/clients/*.ycp
/usr/share/YaST2/modules/*.ycp
/usr/share/YaST2/modules/*.ybc
-%{prefix}/share/applications/YaST2/*.desktop
-%doc %{prefix}/share/doc/packages/yast2-wagon
+/usr/share/YaST2/modules/*.pm
%dir /usr/share/YaST2/include/wagon
/usr/share/YaST2/include/wagon/*.ycp
+%{prefix}/share/applications/YaST2/*.desktop
+%doc %{prefix}/share/doc/packages/yast2-wagon
%exclude %{_datadir}/YaST2/control
%exclude %{_datadir}/YaST2/control/*.xml
@@ -123,7 +130,7 @@
Provides: wagon-control-file
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
Conflicts: otherproviders(wagon-control-file)
Supplements: packageand(yast2-wagon:branding-openSUSE)
@@ -152,7 +159,7 @@
Provides: wagon-control-file
Group: System/YaST
-License: GPLv2+
+License: GPL v2 or later
# Prevent from crashes (BNC #551613)
Requires: yast2-registration >= 2.18.0
++++++ yast2-wagon-2.20.3.tar.bz2 -> yast2-wagon-2.21.2.tar.bz2 ++++++
++++ 5520 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/MAINTAINER new/yast2-wagon-2.21.2/MAINTAINER
--- old/yast2-wagon-2.20.3/MAINTAINER 2010-03-18 14:57:58.000000000 +0100
+++ new/yast2-wagon-2.21.2/MAINTAINER 2011-03-23 12:33:40.000000000 +0100
@@ -1 +1 @@
-Lukas Ocilka
+Ladislav Slezak
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/VERSION new/yast2-wagon-2.21.2/VERSION
--- old/yast2-wagon-2.20.3/VERSION 2011-02-18 14:37:28.000000000 +0100
+++ new/yast2-wagon-2.21.2/VERSION 2011-07-01 10:52:52.000000000 +0200
@@ -1 +1 @@
-2.20.3
+2.21.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/configure.in new/yast2-wagon-2.21.2/configure.in
--- old/yast2-wagon-2.20.3/configure.in 2011-02-18 16:26:58.000000000 +0100
+++ new/yast2-wagon-2.21.2/configure.in 2011-07-01 11:00:28.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-wagon, 2.20.3, http://bugs.opensuse.org/, yast2-wagon)
+AC_INIT(yast2-wagon, 2.21.2, http://bugs.opensuse.org/, yast2-wagon)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,9 +18,9 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.20.3"
+VERSION="2.21.2"
RPMNAME="yast2-wagon"
-MAINTAINER="Lukas Ocilka "
+MAINTAINER="Ladislav Slezak "
dnl pkgconfig honors lib64
pkgconfigdir=\${libdir}/pkgconfig
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/src/clients/wagon.ycp new/yast2-wagon-2.21.2/src/clients/wagon.ycp
--- old/yast2-wagon-2.20.3/src/clients/wagon.ycp 2011-02-18 16:19:28.000000000 +0100
+++ new/yast2-wagon-2.21.2/src/clients/wagon.ycp 2011-06-30 16:22:47.000000000 +0200
@@ -12,7 +12,7 @@
* Summary:
* Online Migration Tool
*
- * $Id: wagon.ycp 63059 2011-01-03 14:54:37Z locilka $
+ * $Id: wagon.ycp 64676 2011-06-30 14:22:45Z lslezak $
*
*/
{
@@ -28,7 +28,6 @@
import "PackageCallbacks";
import "Report";
import "FileUtils";
- import "Popup";
include "wagon/common_func.ycp";
@@ -279,7 +278,7 @@
});
if (size (removed_packages) > 0) {
- y2milestone ("%1 products were removed, reseting packager", size (removed_packages));
+ y2milestone ("%1 products were removed, resetting packager", size (removed_packages));
ResetPackager();
foreach (string one_package, removed_packages, {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/src/clients/wagon_dup_repositories.ycp new/yast2-wagon-2.21.2/src/clients/wagon_dup_repositories.ycp
--- old/yast2-wagon-2.20.3/src/clients/wagon_dup_repositories.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-wagon-2.21.2/src/clients/wagon_dup_repositories.ycp 2011-06-30 16:03:48.000000000 +0200
@@ -0,0 +1,159 @@
+/**
+ * File:
+ * clients/wagon_dup_repositories.ycp
+ *
+ * Module:
+ * Wagon
+ *
+ * Authors:
+ * Ladislav Slezak
+ *
+ * Summary:
+ * Display dialog for selecting distribution upgrade repositories.
+ *
+ *
+ */
+
+{
+ textdomain "wagon";
+
+ import "Wagon";
+ import "GetInstArgs";
+ import "Wizard";
+ import "Popup";
+
+
+ define list TableContent()
+ {
+ // current enabled repositories
+ list<integer> repos = Pkg::SourceGetCurrent(true);
+ list<integer> dup_repos = Wagon::DupRepos();
+ list ret = [];
+
+ y2internal("Current repositories: %1", repos);
+ y2internal("DUP repositories: %1", dup_repos);
+
+ foreach(integer repo, repos,
+ {
+ map info = Pkg::SourceGeneralData(repo);
+ // if nothing selected yet propose all repositories
+ string selected = (dup_repos == [] || contains(dup_repos, repo)) ? UI::Glyph(`CheckMark) : "";
+
+ ret = add(ret, `item(`id(repo), selected, info["name"]:"", info["url"]:""));
+ });
+
+ y2internal("Table content: %1", ret);
+
+ return ret;
+ }
+
+ // display the repository selection dialog
+ define void SetContent()
+ {
+ // heading text
+ string heading_text = _("Migration Repositories");
+
+ term contents = `VBox(
+ `Left(`Label(_("The packages will be switched to versions in the selected repositories."))),
+ `Table(`id(`table), `opt(`notify, `immediate, `keepSorting), `header(`Center(_("Selected")), _("Name"), _("URL")), TableContent()),
+ `HBox(
+ `PushButton(`id(`select), _("Select")),
+ `PushButton(`id(`deselect), _("Deselect"))
+ )
+ );
+
+ // help text
+ string help_text = "<p>" + _("Here select the repositories which will be used for migration.")
+ + "</p><p>" + _("The installed packages will be switched to the versions available in the selected migration repositories.") + "</p>";
+
+ Wizard::SetContents (heading_text, contents, help_text,
+ GetInstArgs::enable_back(), GetInstArgs::enable_next());
+ }
+
+ // run the repository selection dialog
+ define symbol DupSelectionDialog()
+ {
+ SetContent();
+
+ symbol ret = nil;
+
+ while (true) {
+ map event = UI::WaitForEvent();
+ ret = event["ID"]:`nothing;
+
+ if (ret == `table && event["EventReason"]:"" == "Activated")
+ {
+ ret = `toggle;
+ }
+
+ if (ret == `back)
+ {
+ break;
+ }
+ else if (ret == `next)
+ {
+ y2milestone("Table content: %1", UI::QueryWidget(`id(`table), `Items));
+
+ list<term> table_lines = (list<term>)UI::QueryWidget(`id(`table), `Items);
+ list<integer> selected = [];
+
+ foreach(term table_line, table_lines,
+ {
+ if (table_line[1]:"" != "")
+ {
+ selected = add(selected, table_line[0,0]:-1);
+ }
+ });
+
+ if (size(selected) == 0)
+ {
+ // error message, no migration repository selected in the table
+ Popup::Error("Select at least one migration repository.");
+ continue;
+ }
+
+ y2milestone("Selected repositories for distribution upgrade: %1", selected);
+
+ Wagon::SetDupRepos(selected);
+
+ break;
+ }
+ else if ((ret == `abort || ret == `cancel || ret == `close) && Popup::ConfirmAbort (`painless))
+ {
+ ret = `abort;
+ break;
+ }
+ else if (ret == `select || ret == `deselect || ret == `toggle)
+ {
+ integer current = (integer) UI::QueryWidget(`id(`table), `CurrentItem);
+ string selected = "";
+
+ if (ret == `toggle)
+ {
+ // toggle the flag
+ string current_value = (string)UI::QueryWidget(`id(`table), `Cell(current, 0));
+ selected = (current_value == "") ? UI::Glyph(`CheckMark) : "";
+ }
+ else
+ {
+ selected = (ret == `select) ? UI::Glyph(`CheckMark) : "";
+ }
+
+ UI::ChangeWidget(`id(`table), `Cell(current, 0), selected);
+ }
+ else
+ {
+ y2error("Unknown user input: %1", ret);
+ }
+ }
+
+ return ret;
+ }
+
+
+ symbol ret = DupSelectionDialog();
+
+ y2milestone ("Result: %1", ret);
+
+ return ret;
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/src/clients/wagon_point_of_no_return.ycp new/yast2-wagon-2.21.2/src/clients/wagon_point_of_no_return.ycp
--- old/yast2-wagon-2.20.3/src/clients/wagon_point_of_no_return.ycp 2010-03-18 14:57:59.000000000 +0100
+++ new/yast2-wagon-2.21.2/src/clients/wagon_point_of_no_return.ycp 2011-06-30 10:51:06.000000000 +0200
@@ -36,7 +36,7 @@
Wagon::abort_can_revert_products = false;
// @see BNC 575102
- y2milestone ("Reseting repos_already_registered flag");
+ y2milestone ("Resetting repos_already_registered flag");
Wagon::repos_already_registered = false;
return `auto;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-wagon-2.20.3/src/clients/wagon_registration_check.ycp new/yast2-wagon-2.21.2/src/clients/wagon_registration_check.ycp
--- old/yast2-wagon-2.20.3/src/clients/wagon_registration_check.ycp 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-wagon-2.21.2/src/clients/wagon_registration_check.ycp 2011-06-30 10:52:38.000000000 +0200
@@ -0,0 +1,292 @@
+/**
+ * File:
+ * clients/wagon_registration_check.ycp
+ *
+ * Module:
+ * Wagon
+ *
+ * Authors:
+ * Ladislav Slezak
+ *
+ * Summary:
+ * Online Migration Tool
+ *
+ *
+ */
+
+{
+ textdomain "wagon";
+
+ import "GetInstArgs";
+ import "Wagon";
+ import "Wizard";
+ import "Popup";
+
+ // max age for the registration status (in days)
+ integer max_age_days = 90;
+ // max age for the registration status (in seconds)
+ integer max_age = max_age_days * 24 * 60 * 60;
+
+ // is the registration status file outdated?
+ define boolean OutdatedStatus(map status)
+ {
+ // missing data, we cannot tell if it's outdated, suppose not
+ if (!haskey(status, "timestamp") || status["timestamp"]:0 <= 0)
+ {
+ return false;
+ }
+
+ boolean ret = status["timestamp"]:time() + max_age < time();
+ y2milestone("Registration status is outdated: %1", ret);
+
+ return ret;
+ }
+
+ // get deatils about an installed product
+ define map InstalledProduct(string name)
+ {
+ list