Hello community,
here is the log from the commit of package yast2-wagon for openSUSE:Factory checked in at 2012-04-20 15:21:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-wagon (Old)
and /work/SRC/openSUSE:Factory/.yast2-wagon.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-wagon", Maintainer is "lslezak@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-wagon/yast2-wagon.changes 2011-12-15 16:09:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-wagon.new/yast2-wagon.changes 2012-04-20 15:21:57.000000000 +0200
@@ -1,0 +2,46 @@
+Thu Apr 5 12:19:35 UTC 2012 - lslezak@suse.cz
+
+- fixes in helptexts (bnc#755532)
+- 2.22.2
+
+-------------------------------------------------------------------
+Thu Mar 29 16:27:31 CEST 2012 - jsuchome@suse.cz
+
+- merged proofread texts
+
+-------------------------------------------------------------------
+Wed Mar 7 08:14:29 UTC 2012 - lslezak@suse.cz
+
+- ensure that the migration products are removed (bnc#750746)
+
+-------------------------------------------------------------------
+Wed Feb 15 10:33:50 UTC 2012 - lslezak@suse.cz
+
+- Automatically save solver test case in the migration proposal
+ dialog for easy debugging (saved to /var/log/YaST2/wagon_test_case
+ directory) (bnc#746313)
+
+-------------------------------------------------------------------
+Mon Jan 30 15:19:15 UTC 2012 - lslezak@suse.cz
+
+- do full migration only from SP2 repos (but also install patches
+ in addition to minimal migration) (fate#311994)
+
+-------------------------------------------------------------------
+Tue Jan 17 14:02:21 UTC 2012 - lslezak@suse.cz
+
+- ask user to confirm new licenses at upgrade proposal (bnc#741174)
+
+-------------------------------------------------------------------
+Mon Jan 2 13:11:06 UTC 2012 - lslezak@suse.cz
+
+- install also all applicable patches (except optional ones)
+ (part of fate#311994)
+
+-------------------------------------------------------------------
+Wed Dec 21 09:56:24 UTC 2011 - lslezak@suse.cz
+
+- force product upgrade in full migratinon mode, handle product
+ name change in SLES for VMware SP2 migration (bnc#735826)
+
+-------------------------------------------------------------------
Old:
----
yast2-wagon-2.22.1.tar.bz2
New:
----
yast2-wagon-2.22.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-wagon.spec ++++++
--- /var/tmp/diff_new_pack.cZGXOB/_old 2012-04-20 15:21:58.000000000 +0200
+++ /var/tmp/diff_new_pack.cZGXOB/_new 2012-04-20 15:21:58.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package yast2-wagon
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,18 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
-
Name: yast2-wagon
-Version: 2.22.1
+Version: 2.22.2
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: yast2-wagon-%{version}.tar.bz2
-Group: System/YaST
-License: GPL-2.0+
# PackagesUI::RunPackageSelector
Requires: yast2 >= 2.17.40
Requires: yast2-online-update-frontend >= 2.17.9
@@ -39,13 +35,18 @@
Requires: perl-XML-Simple
# Called in proposal and in code
-Requires: yast2-packager >= 2.21.2
Requires: yast2-add-on
+Requires: yast2-packager >= 2.21.2
# Counting packages directly in packages proposal (BNC #573482)
Requires: yast2-update >= 2.18.7
-BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite yast2-update
+BuildRequires: perl-XML-Writer
+BuildRequires: update-desktop-files
+BuildRequires: yast2
+BuildRequires: yast2-devtools
+BuildRequires: yast2-testsuite
+BuildRequires: yast2-update
# xmllint
BuildRequires: libxml2
@@ -65,6 +66,8 @@
BuildArch: noarch
Summary: YaST2 - Migration Tool for Service Packs
+License: GPL-2.0+
+Group: System/YaST
%description
Wagon is a convenience tool to guide the user through the migration. It
@@ -127,13 +130,11 @@
# Generic 'provides'
Provides: wagon-control-file
-Group: System/YaST
-License: GPL-2.0+
-
Conflicts: otherproviders(wagon-control-file)
Supplements: packageand(yast2-wagon:branding-openSUSE)
Summary: YaST Wagon control file for openSUSE
+Group: System/YaST
%description control-openSUSE
YaST Wagon control file for openSUSE
@@ -156,9 +157,6 @@
# Generic 'provides'
Provides: wagon-control-file
-Group: System/YaST
-License: GPL-2.0+
-
# Prevent from crashes (BNC #551613)
Requires: yast2-registration >= 2.18.0
@@ -166,6 +164,7 @@
Supplements: packageand(yast2-wagon:branding-SLE)
Summary: YaST Wagon control file for SLE
+Group: System/YaST
%description control-SLE
YaST Wagon control file for SLE
++++++ yast2-wagon-2.22.1.tar.bz2 -> yast2-wagon-2.22.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.22.1/VERSION new/yast2-wagon-2.22.2/VERSION
--- old/yast2-wagon-2.22.1/VERSION 2011-11-25 19:25:31.000000000 +0100
+++ new/yast2-wagon-2.22.2/VERSION 2012-04-05 14:20:13.000000000 +0200
@@ -1 +1 @@
-2.22.1
+2.22.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.22.1/configure new/yast2-wagon-2.22.2/configure
--- old/yast2-wagon-2.22.1/configure 2011-11-25 19:56:45.000000000 +0100
+++ new/yast2-wagon-2.22.2/configure 2012-04-05 15:07:49.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.22.1.
+# Generated by GNU Autoconf 2.68 for yast2-wagon 2.22.2.
#
# 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.22.1'
-PACKAGE_STRING='yast2-wagon 2.22.1'
+PACKAGE_VERSION='2.22.2'
+PACKAGE_STRING='yast2-wagon 2.22.2'
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.22.1 to adapt to many kinds of systems.
+\`configure' configures yast2-wagon 2.22.2 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.22.1:";;
+ short | recursive ) echo "Configuration of yast2-wagon 2.22.2:";;
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.22.1
+yast2-wagon configure 2.22.2
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.22.1, which was
+It was created by yast2-wagon $as_me 2.22.2, 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.22.1'
+ VERSION='2.22.2'
cat >>confdefs.h <<_ACEOF
@@ -2449,7 +2449,7 @@
-VERSION="2.22.1"
+VERSION="2.22.2"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak "
@@ -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.22.1, which was
+This file was extended by yast2-wagon $as_me 2.22.2, 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.22.1
+yast2-wagon config.status 2.22.2
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.22.1/configure.in new/yast2-wagon-2.22.2/configure.in
--- old/yast2-wagon-2.22.1/configure.in 2011-11-25 19:56:43.000000000 +0100
+++ new/yast2-wagon-2.22.2/configure.in 2012-04-05 15:07:47.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.21.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-wagon, 2.22.1, http://bugs.opensuse.org/, yast2-wagon)
+AC_INIT(yast2-wagon, 2.22.2, 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.22.1"
+VERSION="2.22.2"
RPMNAME="yast2-wagon"
MAINTAINER="Ladislav Slezak "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.22.1/src/clients/wagon_congratulate.ycp new/yast2-wagon-2.22.2/src/clients/wagon_congratulate.ycp
--- old/yast2-wagon-2.22.1/src/clients/wagon_congratulate.ycp 2011-11-25 17:31:16.000000000 +0100
+++ new/yast2-wagon-2.22.2/src/clients/wagon_congratulate.ycp 2012-04-05 15:07:38.000000000 +0200
@@ -11,7 +11,7 @@
* Summary:
* Online Migration Tool
*
- * $Id: wagon_congratulate.ycp 66818 2011-11-16 10:49:26Z jsuchome $
+ * $Id: wagon_congratulate.ycp 67867 2012-04-05 13:07:37Z lslezak $
*
*/
@@ -35,15 +35,15 @@
if (text == nil || text == "") {
y2warning ("Using fallback migration_congratulate text");
- text =
- _("<p><b>Congratulations!</b><br>
+ // translators: %1 is a URL, e.g. http://www.suse.com
+ text = sformat(_("<p><b>Congratulations!</b><br>
You have successfully finished the on-line migration.</p>
<p>The whole system has been upgraded. It should be rebooted
as soon as possible.</p>
-<p>Please visit us at http://www.novell.com/linux/.</p>
+<p>Please visit us at %1.</p>
<p>Have a nice day!<br>
Your SUSE Linux Team</p>
-");
+"), "http://www.suse.com");
}
term contents = `VBox (
@@ -60,7 +60,7 @@
);
string help = _("<p><b>Finish</b> will close the migration.
-Restart the system as soon as possible.</b>
+Restart the system as soon as possible.</p>
");
Wizard::SetContents (caption, contents, help,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.22.1/src/clients/wagon_dup_repositories.ycp new/yast2-wagon-2.22.2/src/clients/wagon_dup_repositories.ycp
--- old/yast2-wagon-2.22.1/src/clients/wagon_dup_repositories.ycp 2011-11-25 17:31:16.000000000 +0100
+++ new/yast2-wagon-2.22.2/src/clients/wagon_dup_repositories.ycp 2012-03-21 17:06:17.000000000 +0100
@@ -156,7 +156,7 @@
// heading text
string heading_text = _("Migration Type");
// full migration?
- boolean full = sort(Wagon::DupRepos()) == sort(Pkg::SourceGetCurrent(true));
+ boolean full = Wagon::MigrationType() == `full;
term contents = `VBox(
// frame label
@@ -168,7 +168,7 @@
// radio button
`Left(`RadioButton(`id(`minimal), _("&Minimal - upgrade from repositories added by registration"), !full)),
// radio button
- `Left(`RadioButton(`id(`full), _("&Full - upgrade from all repositories"), full))
+ `Left(`RadioButton(`id(`full), _("&Full - install also available patches in addition to Minimal migration"), full))
)
)
)
@@ -200,6 +200,7 @@
list<integer> prev_dup_repos = Wagon::DupRepos();
boolean prev_manual_selection = Wagon::ManualRepoSelection();
+ symbol prev_migration_type = Wagon::MigrationType();
while (true) {
// go to advanced config it was used previously
@@ -211,17 +212,9 @@
symbol mtype = (symbol) UI::QueryWidget(`id(`migration_type), `CurrentButton);
y2milestone("Selected migration type: %1", mtype);
- if (mtype == `full)
+ if (mtype == `full || mtype == `minimal)
{
- // DUP: all repositories
- y2milestone("Selected full migration, using %1 repositories", size(Pkg::SourceGetCurrent(true)));
- Wagon::SetDupRepos(Pkg::SourceGetCurrent(true));
- Wagon::SetManualRepoSelection(false);
- }
- else if (mtype == `minimal)
- {
- // DUP: only added repositories
- y2milestone("Selected minimal migration, using these repositories: %1", Wagon::RegistrationRepos());
+ y2milestone("Selected minimal or full migration, using these repositories: %1", Wagon::RegistrationRepos());
map alias_to_id = $[];
foreach(integer repo, Pkg::SourceGetCurrent(true),
@@ -240,6 +233,7 @@
Wagon::SetDupRepos(added_repos);
Wagon::SetManualRepoSelection(false);
+ Wagon::SetMigrationType(mtype);
}
else
{
@@ -273,6 +267,7 @@
else if (ret == `next)
{
Wagon::SetManualRepoSelection(true);
+ Wagon::SetMigrationType(`custom);
break;
}
else if (ret == `back)
@@ -292,7 +287,7 @@
}
}
- if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection()))
+ if (ret == `next && (prev_dup_repos != Wagon::DupRepos() || prev_manual_selection != Wagon::ManualRepoSelection() || prev_migration_type != Wagon::MigrationType()))
{
y2milestone("DUP repository config has been changed, repropose package selection");
Wagon::ResetDUPProposal();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-wagon-2.22.1/src/modules/Wagon.ycp new/yast2-wagon-2.22.2/src/modules/Wagon.ycp
--- old/yast2-wagon-2.22.1/src/modules/Wagon.ycp 2011-11-25 19:36:28.000000000 +0100
+++ new/yast2-wagon-2.22.2/src/modules/Wagon.ycp 2012-04-05 15:06:58.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Lukas Ocilka
* Internal
*
- * $Id: Wagon.ycp 66963 2011-11-25 18:37:32Z lslezak $
+ * $Id: Wagon.ycp 67825 2012-03-29 14:27:41Z jsuchome $
*
* Module for handling WAGON.
*
@@ -154,6 +154,34 @@
new_registration_repos = repos;
}
+ // migration type, one of `minimal, `full, `custom
+ symbol migration_type = `minimal;
+
+ // get the current migration type
+ global symbol MigrationType()
+ {
+ return migration_type;
+ }
+
+ // set the migration type
+ // @param type Type of migration (`minimal, `full, `custom)
+ // @return boolean true on success
+ global boolean SetMigrationType(symbol type)
+ {
+ if (contains([`minimal, `full, `custom], type))
+ {
+ migration_type = type;
+ y2milestone("Setting migration type: %1", type);
+ return true;
+ }
+ else
+ {
+ y2error("Invalid migration type: %1", type);
+ y2warning("Keeping the current type: %1", migration_type);
+ return false;
+ }
+ }
+
void ResetWorkflowSteps () {
ProductControl::UnDisableAllModulesAndProposals (Mode::mode(), Stage::stage());
}
@@ -430,31 +458,46 @@
list<integer> repos = Pkg::GetUpgradeRepos();
foreach(integer repo, repos, {Pkg::RemoveUpgradeRepo(repo);});
- // all repositories selected for upgrade?
- if (sort(Pkg::SourceGetCurrent(true)) == sort(dup_repos))
- {
- // reset solver flags (needed when switching from full DUP to partial DUP
- Pkg::SetSolverFlags($["reset" : true]);
+ // reset solver flags
+ Pkg::SetSolverFlags($["reset" : true]);
- // do full distribution upgrade
- map update_conf = GetUpdateConf();
- map update_sum = Pkg::PkgUpdateAll (update_conf);
- y2milestone ("Update configuration: %1, update summary: %2", update_conf, update_sum);
- }
- else
+ // add upgrade repositories
+ y2milestone("Adding upgrade repos: %1", dup_repos);
+ foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);});
+
+ // be compatible with "zypper dup --from"
+ Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]);
+
+ // ensure the migration products are removed
+ foreach(string migration_product, migration_products,
+ {
+ y2milestone("Removing migration product: %1", migration_product);
+ Pkg::ResolvableRemove(migration_product, `product);
+ }
+ );
+
+ if (MigrationType() == `full)
{
- // do partial DUP
- // add upgrade repositories
- y2milestone("Adding upgrade repos: %1", dup_repos);
- foreach(integer repo, dup_repos, {Pkg::AddUpgradeRepo(repo);});
+ // run the solver to evaluate applicable patches
+ Pkg::PkgSolve(false);
- // be compatible with "zypper dup --from"
- Pkg::SetSolverFlags($["ignoreAlreadyRecommended" : true]);
+ // preselect all applicable patches (except optional ones)
+ integer patches = Pkg::ResolvablePreselectPatches(`all);
+ y2milestone("Preselected patches: %1", patches);
}
// set the solve error flag for packages proposal
Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors();
+ if (!AcceptLicenses())
+ {
+ // rerun the solver after rejecting a package license
+ // (setting the package to taboo state)
+ Update::solve_errors = Pkg::PkgSolve(true) ? 0 : Pkg::PkgSolveErrors();
+ }
+
+ Pkg::CreateSolverTestCase("/var/log/YaST2/wagon_test_case");
+
already_proposed = true;
return true;
@@ -575,7 +618,9 @@
transact_by = product["transact_by"]:`unknown;
// Removing product and installing the same one (name) means -> upgrade
- if (contains (products_to_be_installed, name)) {
+ // Hack: SLES-for-VMware migration changes the product from "SUSE_SLES" to "SLES-for-VMware", check this upgrade
+ if (contains(products_to_be_installed, name) ||
+ ( name == "SUSE_SLES" && contains(products_to_be_installed, "SLES-for-VMware") && contains(migration_products, "SLES-for-VMware-SP2-migration"))) {
products_to_be_upgraded = add (products_to_be_upgraded, name);
y2milestone ("Product to be upgraded: %1 (this is the removed one)", product);
// Do not list this product as 'to removed', list it as 'to upgrade'
@@ -617,16 +662,35 @@
display_name = product["display_name"]:product["short_name"]:product["name"]:_("No name defined.");
name = product["name"]:_("No short name defined.");
+ // Hack: SLES-for-VMware migration changes the product from "SUSE_SLES" to "SLES-for-VMware", check this upgrade
+ boolean sles_for_vmware_upgrade = (name == "SLES-for-VMware" && contains(products_to_be_upgraded, "SUSE_SLES") && contains(migration_products, "SLES-for-VMware-SP2-migration"));
+
// Product is going to be upgraded (removed + installed new version)
- if (contains (products_to_be_upgraded, name)) {
- y2milestone ("Product will be upgraded to: %1 (this is the installed one)", product);
- ret = ret + "<li>" + sformat (
- _("Product <b>%1</b> will be upgraded"),
- GetDisplayName (display_name, name)
- ) + "</li>\n";
+ if (contains (products_to_be_upgraded, name) || sles_for_vmware_upgrade) {
+ map old_product = find(map p, products, {return p["name"]:"" == (sles_for_vmware_upgrade ? "SUSE_SLES" : name) && p["status"]:`unknown == `removed;});
+ string old_product_name = old_product["name"]:_("No name defined.");
+ string old_display_name = old_product["display_name"]:old_product["short_name"]:old_product["name"]:_("No name defined.");
+
+ y2milestone ("Detected product upgrade from: '%1' to: '%2'", old_display_name, display_name);
+ y2milestone ("Product will be upgraded to: %1 (this is the new one)", product);
+
+ if (old_display_name == display_name)
+ {
+ ret = ret + "<li>" + sformat (
+ _("Product <b>%1</b> will be upgraded"),
+ GetDisplayName(old_display_name, old_product_name)
+ ) + "</li>\n";
+ }
+ else
+ {
+ ret = ret + "<li>" + sformat (
+ _("Product <b>%1</b> will be upgraded to <b>%2</b>"),
+ GetDisplayName(old_display_name, old_product_name), GetDisplayName(display_name, name)
+ ) + "</li>\n";
+ }
// Newly installed product
} else {
- y2milestone ("Product will be upgraded: %1", product);
+ y2milestone ("New product will be installed: %1", product);
ret = ret + "<li>" + sformat (
_("New product <b>%1</b> will be installed"),
GetDisplayName (display_name, name)
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org