Hello community,
here is the log from the commit of package yast2-wagon for openSUSE:Factory
checked in at Tue Jul 19 14:46:32 CEST 2011.
--------
--- yast2-wagon/yast2-wagon.changes 2011-07-01 12:54:00.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-wagon/yast2-wagon.changes
2011-07-18 15:26:21.000000000 +0200
@@ -1,0 +2,12 @@
+Mon Jul 18 12:48:20 UTC 2011 - lsle...@suse.cz
+
+- added new core/full migration selection dialog
+- 2.21.3
+
+-------------------------------------------------------------------
+Mon Jul 4 11:28:46 UTC 2011 - lsle...@suse.cz
+
+- if the system is managed by SUSE Manager display a message
+ and exit (fate#311994)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-wagon-2.21.2.tar.bz2
New:
----
yast2-wagon-2.21.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-wagon.spec ++++++
--- /var/tmp/diff_new_pack.Nvwg2r/_old 2011-07-19 14:46:10.000000000 +0200
+++ /var/tmp/diff_new_pack.Nvwg2r/_new 2011-07-19 14:46:10.000000000 +0200
@@ -19,11 +19,11 @@
Name: yast2-wagon
-Version: 2.21.2
+Version: 2.21.3
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-wagon-2.21.2.tar.bz2
+Source0: yast2-wagon-2.21.3.tar.bz2
Prefix: /usr
@@ -74,7 +74,7 @@
through command line tools.
%prep
-%setup -n yast2-wagon-2.21.2
+%setup -n yast2-wagon-2.21.3
%build
%{prefix}/bin/y2tool y2autoconf
@@ -180,5 +180,4 @@
%dir %{_datadir}/YaST2/control
%{_datadir}/YaST2/control/online_migration-SLE.xml
%ghost %{_datadir}/YaST2/control/online_migration.xml
-
%changelog
++++++ yast2-wagon-2.21.2.tar.bz2 -> yast2-wagon-2.21.3.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.2/VERSION
new/yast2-wagon-2.21.3/VERSION
--- old/yast2-wagon-2.21.2/VERSION 2011-07-01 10:52:52.000000000 +0200
+++ new/yast2-wagon-2.21.3/VERSION 2011-07-18 15:04:17.000000000 +0200
@@ -1 +1 @@
-2.21.2
+2.21.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.2/configure
new/yast2-wagon-2.21.3/configure
--- old/yast2-wagon-2.21.2/configure 2011-07-01 11:00:34.000000000 +0200
+++ new/yast2-wagon-2.21.3/configure 2011-07-18 15:25:47.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.2.
+# Generated by GNU Autoconf 2.68 for yast2-wagon 2.21.3.
#
# Report bugs to <http://bugs.opensuse.org/>.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-wagon'
PACKAGE_TARNAME='yast2-wagon'
-PACKAGE_VERSION='2.21.2'
-PACKAGE_STRING='yast2-wagon 2.21.2'
+PACKAGE_VERSION='2.21.3'
+PACKAGE_STRING='yast2-wagon 2.21.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1229,7 +1229,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-wagon 2.21.2 to adapt to many kinds of systems.
+\`configure' configures yast2-wagon 2.21.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1300,7 +1300,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-wagon 2.21.2:";;
+ short | recursive ) echo "Configuration of yast2-wagon 2.21.3:";;
esac
cat <<\_ACEOF
@@ -1380,7 +1380,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-wagon configure 2.21.2
+yast2-wagon configure 2.21.3
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1397,7 +1397,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-wagon $as_me 2.21.2, which was
+It was created by yast2-wagon $as_me 2.21.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2327,7 +2327,7 @@
# Define the identity of the package.
PACKAGE='yast2-wagon'
- VERSION='2.21.2'
+ VERSION='2.21.3'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.21.2"
+VERSION="2.21.3"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
@@ -3386,7 +3386,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-wagon $as_me 2.21.2, which was
+This file was extended by yast2-wagon $as_me 2.21.3, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3439,7 +3439,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-wagon config.status 2.21.2
+yast2-wagon config.status 2.21.3
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.2/configure.in
new/yast2-wagon-2.21.3/configure.in
--- old/yast2-wagon-2.21.2/configure.in 2011-07-01 11:00:28.000000000 +0200
+++ new/yast2-wagon-2.21.3/configure.in 2011-07-18 15:25:45.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.21.2, http://bugs.opensuse.org/, yast2-wagon)
+AC_INIT(yast2-wagon, 2.21.3, http://bugs.opensuse.org/, yast2-wagon)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.21.2"
+VERSION="2.21.3"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak <lsle...@suse.cz>"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-wagon-2.21.2/src/clients/wagon_dup_repositories.ycp
new/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp
--- old/yast2-wagon-2.21.2/src/clients/wagon_dup_repositories.ycp
2011-06-30 16:03:48.000000000 +0200
+++ new/yast2-wagon-2.21.3/src/clients/wagon_dup_repositories.ycp
2011-07-18 14:37:07.000000000 +0200
@@ -150,8 +150,138 @@
return ret;
}
+ void SetMigrationSelectionDialogContent()
+ {
+ // heading text
+ string heading_text = _("Migration Type");
- symbol ret = DupSelectionDialog();
+ term contents = `VBox(
+ // frame label
+ `Frame(_("Migration type"),
+ `HSquash(
+ `MarginBox(2, 0.5,
+ `RadioButtonGroup(`id(`migration_type),
+ `VBox(
+ // radio button
+ `Left(`RadioButton(`id(`minimal), _("&Minimal
migration (only the core packages)"), true)),
+ // radio button
+ `Left(`RadioButton(`id(`full), _("&Full
migration (all packages)")))
+ )
+ )
+ )
+ )
+ ),
+
+ `VSpacing(2),
+
+ // push button
+ `PushButton(`id(`advanced), _("Advanced..."))
+ );
+
+ // help text
+ string help_text = "<p>" + _("Select the requested migration type.")
+ // help text
+ + "</p><p>" + _("Minimal migration migrates only minimal set of
packages (the core packages providing basic system functionality), full
migration migrates all installed packages.") + "</p>";
+
+ Wizard::SetContents (heading_text, contents, help_text,
+ GetInstArgs::enable_back(), GetInstArgs::enable_next());
+ }
+
+ symbol MigrationSelectionDialog()
+ {
+ SetMigrationSelectionDialogContent();
+
+ symbol ret = nil;
+
+ while (true) {
+ ret = (symbol)UI::UserInput();
+
+ if (ret == `next)
+ {
+ // set the update repositories
+ symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type),
`CurrentButton);
+ y2milestone("Selected migration type: %1", mtype);
+
+ if (mtype == `full)
+ {
+ // DUP: all repositories
+ y2milestone("Selected full migration, using %1
repositories", size(Pkg::SourceGetCurrent(true)));
+ Wagon::SetDupRepos(Pkg::SourceGetCurrent(true));
+ }
+ else if (mtype == `minimal)
+ {
+ // DUP: only added repositories
+ y2milestone("Selected minimal migration, using these
repositories: %1", Wagon::RegistrationRepos());
+
+ map<string, integer> alias_to_id = $[];
+ foreach(integer repo, Pkg::SourceGetCurrent(true),
+ {
+
alias_to_id[Pkg::SourceGeneralData(repo)["alias"]:""] = repo;
+ }
+ );
+
+ list<integer> added_repos = maplist(string alias,
Wagon::RegistrationRepos(),
+ {
+ return alias_to_id[alias]:-1;
+ }
+ );
+
+ y2milestone("Converted aliases to ids: %1", added_repos);
+
+ Wagon::SetDupRepos(added_repos);
+ }
+ else
+ {
+ // error popup message
+ Popup::Error(sformat(_("Selected unknown migration type:
%1"), mtype));
+ y2error("Unknown migratinon type: %1", mtype);
+
+ continue;
+ }
+
+ break;
+ }
+ else if (ret == `back)
+ {
+ break;
+ }
+ else if (ret == `abort || ret == `close)
+ {
+ break;
+ }
+ else if (ret == `advanced)
+ {
+ // manually select DUP repositories
+ y2milestone("Manual DUP repository selection selected");
+ ret = DupSelectionDialog();
+
+ if (ret == `abort || ret == `close || ret == `next)
+ {
+ break;
+ }
+ else if (ret == `back)
+ {
+ // refresh the dialog
+ SetMigrationSelectionDialogContent();
+ }
+ else
+ {
+ y2error("Unexpected user input: %1", ret);
+ }
+ }
+ else
+ {
+ y2error("Unexpected user input: %1", ret);
+ }
+ }
+
+ return ret;
+ }
+
+ // for custom migration repo we cannot select full/core migration type,
+ // and also when there is no new registration repo we cannot detect
full/core migrations
+ // => go directly to the repository selection (advanced option)
+ symbol ret = (Wagon::GetMigrationMethod() == "suse_register" &&
size(Wagon::RegistrationRepos()) > 0) ? MigrationSelectionDialog() :
DupSelectionDialog();
y2milestone ("Result: %1", ret);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-wagon-2.21.2/src/clients/wagon_registration_handler.ycp
new/yast2-wagon-2.21.3/src/clients/wagon_registration_handler.ycp
--- old/yast2-wagon-2.21.2/src/clients/wagon_registration_handler.ycp
2010-03-24 08:23:28.000000000 +0100
+++ new/yast2-wagon-2.21.3/src/clients/wagon_registration_handler.ycp
2011-07-18 10:58:35.000000000 +0200
@@ -57,6 +57,16 @@
return sort (ret);
}
+ list<string> AddedRepos(list<string> prev, list<string> curr)
+ {
+ list<string> ret = [];
+
+ // added repos = all current which were not in the previous state
+ ret = filter(string curr_repo, curr, {return !contains(prev,
curr_repo);});
+
+ return ret;
+ }
+
// all repository aliases
list <string> all_repos = GetCurrentlyEnabledReposByAlias();
y2milestone ("Currently registered repositories: %1", all_repos);
@@ -91,7 +101,13 @@
list <string> current_repos = GetCurrentlyEnabledReposByAlias();
if (all_repos != current_repos) {
Wagon::repos_already_registered = true;
+
+ // remember the added repositories
+ list<string> added = AddedRepos(all_repos, current_repos);
+ Wagon::SetRegistrationRepos(added);
+
y2milestone ("List of repositories has changed: %1", current_repos);
+ y2milestone("Added repositories: %1", added);
break;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.2/src/clients/welcome_in_wagon.ycp
new/yast2-wagon-2.21.3/src/clients/welcome_in_wagon.ycp
--- old/yast2-wagon-2.21.2/src/clients/welcome_in_wagon.ycp 2010-03-24
08:23:28.000000000 +0100
+++ new/yast2-wagon-2.21.3/src/clients/welcome_in_wagon.ycp 2011-07-08
10:53:10.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
* Online Migration Tool
*
- * $Id: welcome_in_wagon.ycp 61069 2010-03-01 15:11:31Z locilka $
+ * $Id: welcome_in_wagon.ycp 64721 2011-07-04 11:38:33Z lslezak $
*
*/
@@ -21,6 +21,7 @@
import "Popup";
import "Wagon";
import "Report";
+ import "FileUtils";
textdomain "wagon";
@@ -41,6 +42,18 @@
GetInstArgs::enable_back(), GetInstArgs::enable_next());
Wizard::EnableAbortButton ();
+ // file /etc/sysconfig/rhn/systemid means the system is managed by SUSE
Manager
+ if (FileUtils::Exists("/etc/sysconfig/rhn/systemid"))
+ {
+ y2milestone("File /etc/sysconfig/rhn/systemid found, aborting wagon");
+
+ // warning message, system managed by SUSE Manager cannot be migrated
by wagon
+ // display this message and exit
+ Popup::Message(_("This system is managed by SUSE Manager,\nYaST wagon
module cannot migrate systems managed by SUSE Manager.\n\nPress OK to exit."));
+
+ return (any)`back;
+ }
+
any ret = nil;
while (true) {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-wagon-2.21.2/src/modules/Wagon.ycp
new/yast2-wagon-2.21.3/src/modules/Wagon.ycp
--- old/yast2-wagon-2.21.2/src/modules/Wagon.ycp 2011-06-24
15:06:41.000000000 +0200
+++ new/yast2-wagon-2.21.3/src/modules/Wagon.ycp 2011-07-18
15:25:43.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Lukas Ocilka <loci...@suse.cz>
* Internal
*
- * $Id: Wagon.ycp 64589 2011-06-24 13:06:40Z lslezak $
+ * $Id: Wagon.ycp 64872 2011-07-18 13:25:42Z lslezak $
*
* Module for handling WAGON.
*
@@ -123,6 +123,21 @@
dup_repos = repos;
}
+ // list of repositories (aliases) added by suse_register
+ list<string> new_registration_repos = [];
+
+ // returns list of repositories (aliases) added by suse_register
+ global list<string> RegistrationRepos()
+ {
+ return new_registration_repos;
+ }
+
+ // set list of repositories (aliases) added by suse_register
+ global void SetRegistrationRepos(list<string> repos)
+ {
+ y2milestone("Repositories added by registration: %1",
new_registration_repos);
+ new_registration_repos = repos;
+ }
void ResetWorkflowSteps () {
ProductControl::UnDisableAllModulesAndProposals (Mode::mode(),
Stage::stage());
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
