Hello community,
here is the log from the commit of package zypper-migration-plugin for
openSUSE:Factory checked in at 2018-06-22 13:35:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zypper-migration-plugin (Old)
and /work/SRC/openSUSE:Factory/.zypper-migration-plugin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypper-migration-plugin"
Fri Jun 22 13:35:46 2018 rev:4 rq:618301 version:0.12.1529570802.4a668e3
Changes:
--------
---
/work/SRC/openSUSE:Factory/zypper-migration-plugin/zypper-migration-plugin.changes
2018-03-13 10:24:20.337124620 +0100
+++
/work/SRC/openSUSE:Factory/.zypper-migration-plugin.new/zypper-migration-plugin.changes
2018-06-22 13:35:48.369712467 +0200
@@ -1,0 +2,11 @@
+Thu Jun 21 08:48:18 UTC 2018 - [email protected]
+
+- adjusted packaging of changes file
+
+-------------------------------------------------------------------
+Tue Jun 12 13:20:24 CEST 2018 - [email protected]
+
+- implement offline migration
+- require SUSEConnect >= 0.3.10
+
+-------------------------------------------------------------------
Old:
----
zypper-migration-0.11.1520597355.bcf74ad.tar.xz
New:
----
zypper-migration-0.12.1529570802.4a668e3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper-migration-plugin.spec ++++++
--- /var/tmp/diff_new_pack.XPEsoK/_old 2018-06-22 13:35:49.133684225 +0200
+++ /var/tmp/diff_new_pack.XPEsoK/_new 2018-06-22 13:35:49.137684078 +0200
@@ -17,11 +17,11 @@
Name: zypper-migration-plugin
-Version: 0.11.1520597355.bcf74ad
+Version: 0.12.1529570802.4a668e3
Release: 0
Url: https://github.com/SUSE/zypper-migration
Requires: zypper >= 1.11.38
-Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.24
+Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.3.10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: zypper >= 1.11.38
++++++ _service ++++++
--- /var/tmp/diff_new_pack.XPEsoK/_old 2018-06-22 13:35:49.173682747 +0200
+++ /var/tmp/diff_new_pack.XPEsoK/_new 2018-06-22 13:35:49.177682599 +0200
@@ -2,9 +2,8 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/SUSE/zypper-migration</param>
<param name="scm">git</param>
- <param name="extract">zypper-migration-plugin.changes</param>
<param name="extract">zypper-migration-plugin.spec</param>
- <param name="versionprefix">0.11</param>
+ <param name="versionprefix">0.12</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ zypper-migration-0.11.1520597355.bcf74ad.tar.xz ->
zypper-migration-0.12.1529570802.4a668e3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration
new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration
--- old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration
2018-03-09 13:09:15.000000000 +0100
+++ new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration
2018-06-21 10:46:42.000000000 +0200
@@ -99,6 +99,13 @@
system "sh /var/adm/backup/system-upgrade/repos.sh >/dev/null"
end
+def check_if_param(opt, message)
+ unless opt
+ print message
+ exit 1
+ end
+end
+
options = {
:allow_vendor_change => false,
@@ -117,6 +124,9 @@
:details => false,
:download => nil,
:no_snapshots => false,
+ :to_product => nil,
+ :break_my_system => false,
+ :selfupdate => true,
:root => nil
}
@@ -199,6 +209,22 @@
options[:no_snapshots] = true
end
+ opts.on("--break-my-system", "For testing and debugging purpose only.") do
+ options[:break_my_system] = true
+ end
+
+ opts.on("--product PRODUCT", "Specify a product to which the system should
be upgraded in offline mode.",
+ "Format: <name>/<version>/<architecture>") do |p|
+ check_if_param(p, 'Please provide a product identifier')
+ check_if_param((p =~ /\S+\/\S+\/\S+/), 'Please provide the product
identifier in this format: ' \
+ '<internal name>/<version>/<architecture>.')
+ options[:to_product] = p
+ end
+
+ opts.on("--[no-]selfupdate", "Do not update the update stack first") do |s|
+ options[:selfupdate] = s
+ end
+
opts.on("--root DIR", "Operate on a different root directory") do |r|
options[:root] = r
SUSE::Connect::System.filesystem_root = r
@@ -208,38 +234,45 @@
end.parse!
-# Update stack can be outside of the to be updated system
-cmd = "zypper " +
- (options[:non_interactive] ? "--non-interactive " : "") +
- (options[:verbose] ? "--verbose " : "") +
- (options[:quiet] ? "--quiet " : "") +
- "patch-check --updatestack-only"
-print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
-if !system cmd
- if $?.exitstatus >= 100
- # install pending updates and restart
- cmd = "zypper " +
- (options[:non_interactive] ? "--non-interactive " : "") +
- (options[:verbose] ? "--verbose " : "") +
- (options[:quiet] ? "--quiet " : "") +
- "--no-refresh patch --updatestack-only"
- print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
- system cmd
-
- # stop infinite restarting
- # check that the patches were really installed
- cmd = "zypper " +
- (options[:root] ? "--root #{options[:root]} " : "") +
- "--non-interactive --quiet --no-refresh patch-check --updatestack-only >
/dev/null"
- if ! system cmd
- print "patch failed, exiting.\n"
- exit 1
- end
+if options[:to_product] && !options[:root] && !options[:break_my_system]
+ print "The --product option can only be used together with the --root
option\n"
+ exit 1
+end
+
+if options[:selfupdate]
+ # Update stack can be outside of the to be updated system
+ cmd = "zypper " +
+ (options[:non_interactive] ? "--non-interactive " : "") +
+ (options[:verbose] ? "--verbose " : "") +
+ (options[:quiet] ? "--quiet " : "") +
+ "patch-check --updatestack-only"
+ print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
+ if !system cmd
+ if $?.exitstatus >= 100
+ # install pending updates and restart
+ cmd = "zypper " +
+ (options[:non_interactive] ? "--non-interactive " : "") +
+ (options[:verbose] ? "--verbose " : "") +
+ (options[:quiet] ? "--quiet " : "") +
+ "--no-refresh patch --updatestack-only"
+ print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
+ system cmd
+
+ # stop infinite restarting
+ # check that the patches were really installed
+ cmd = "zypper " +
+ (options[:root] ? "--root #{options[:root]} " : "") +
+ "--non-interactive --quiet --no-refresh patch-check --updatestack-only
> /dev/null"
+ if ! system cmd
+ print "patch failed, exiting.\n"
+ exit 1
+ end
- print "\nRestarting the migration script...\n" unless options[:quiet]
- exec $0, *save_argv
+ print "\nRestarting the migration script...\n" unless options[:quiet]
+ exec $0, *save_argv
+ end
+ exit 1
end
- exit 1
end
print "\n" unless options[:quiet]
@@ -297,11 +330,26 @@
exit 1
end
-begin
- migrations_all = SUSE::Connect::YaST.system_migrations system_products
-rescue => e
- print "Can't get available migrations from server: #{e.class}:
#{e.message}\n"
- exit 1
+if options[:to_product]
+ begin
+ identifier, version, arch = options[:to_product].split('/')
+ new_product = OpenStruct.new(
+ identifier: identifier,
+ version: version,
+ arch: arch
+ )
+ migrations_all =
SUSE::Connect::YaST.system_offline_migrations(system_products, new_product)
+ rescue => e
+ print "Can't get available migrations from server: #{e.class}:
#{e.message}\n"
+ exit 1
+ end
+else
+ begin
+ migrations_all = SUSE::Connect::YaST.system_migrations system_products
+ rescue => e
+ print "Can't get available migrations from server: #{e.class}:
#{e.message}\n"
+ exit 1
+ end
end
#preprocess the migrations lists
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration-plugin.changes
new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration-plugin.changes
---
old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration-plugin.changes
2018-03-09 13:09:15.000000000 +0100
+++
new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration-plugin.changes
1970-01-01 01:00:00.000000000 +0100
@@ -1,113 +0,0 @@
--------------------------------------------------------------------
-Fri Mar 9 11:37:00 UTC 2018 - [email protected]
-
-- more changes to get --root working
-
--------------------------------------------------------------------
-Thu Jan 25 09:54:05 UTC 2018 - [email protected]
-
-- add --no-snapshots and --root options
-- version 0.11
-
--------------------------------------------------------------------
-Wed Aug 31 09:05:47 UTC 2016 - [email protected]
-
-- use the same snapper commandline as yast2 migration (bsc#984324)
-- version 0.10
-
--------------------------------------------------------------------
-Mon Apr 18 15:32:36 UTC 2016 - [email protected]
-
-- better help for --download-only (bsc#973886)
-- call rollback only if release package can't be installed
-- better error messages (bsc#975485)
-- added man page (bsc#972688)
-- version 0.9
-
--------------------------------------------------------------------
-Mon Apr 4 11:51:44 UTC 2016 - [email protected]
-
-- install release packages and call SUSEConnect
- rollback before getting migration target
- (fate#320533)
-
--------------------------------------------------------------------
-Tue Dec 15 14:15:55 UTC 2015 - [email protected]
-
-- do not add --recommends by default (bsc#959134)
-
--------------------------------------------------------------------
-Fri Nov 27 11:42:03 UTC 2015 - [email protected]
-
-- Extended Supplements from zypper to zypper and SUSEConnect to improve
- handling of dependencies
-
--------------------------------------------------------------------
-Thu Nov 26 13:16:00 UTC 2015 - [email protected]
-
-- Added Supplements for zypper to ensure automatic installation
-
--------------------------------------------------------------------
-Tue Oct 20 14:25:02 UTC 2015 - [email protected]
-
-- version 0.8
-- use stable sort for product list returned by scc
-
--------------------------------------------------------------------
-Fri Oct 9 09:11:02 UTC 2015 - [email protected]
-
-- fixed obsoleted service check to work with SMT
-
--------------------------------------------------------------------
-Thu Oct 1 15:07:57 UTC 2015 - [email protected]
-
-- version 0.7
-- backup of /etc/zypp (bsc#946858)
-- do not create extra snapshots (bnc#947270)
-- correctly handle zypper failures (bnc#946750)
-
--------------------------------------------------------------------
-Sun Sep 20 11:23:51 UTC 2015 - [email protected]
-
-- version 0.6
-- better exception handling (bsc#946003, bsc#945681, bsc#946206)
-- sync output (bnc#945619)
-- use --no-refresh where possible (bsc#945462)
-- rollback (bsc#941458)
-
--------------------------------------------------------------------
-Thu Sep 10 12:17:05 UTC 2015 - [email protected]
-
-- version 0.5
-- use --updatestack-only (bsc#945030)
-
--------------------------------------------------------------------
-Thu Aug 27 14:23:15 UTC 2015 - [email protected]
-
-- version 0.4
-- handle products with flag 'available'
-- install patches, restart after updates (bsc#943267)
-- use long product names
-- sort product list, put installed products at the end (bsc#943269)
-
--------------------------------------------------------------------
-Tue Aug 18 13:25:05 UTC 2015 - [email protected]
-
-- version 0.3
-- handle api exceptions (bsc#940771)
-- create snapshots (bsc#941460)
-- use releasever (bsc#941565)
-- do not print internal product name (bsc#941630)
-
--------------------------------------------------------------------
-Tue Aug 4 12:51:49 UTC 2015 - [email protected]
-
-- version 0.2
-- disable obsolete repos (fate#319140)
-- require suse-connect >= 0.2.20
-
--------------------------------------------------------------------
-Tue Jun 23 11:38:57 UTC 2015 - [email protected]
-
-- new package
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration-plugin.spec
new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration-plugin.spec
--- old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration-plugin.spec
2018-03-09 13:09:15.000000000 +0100
+++ new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration-plugin.spec
2018-06-21 10:46:42.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package zypper-migration
+# spec file for package zypper-migration-plugin
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX 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,19 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: zypper-migration-plugin
-Version: 0.11
-URL: https://github.com/SUSE/zypper-migration
+Version: 0.12
Release: 0
-Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.24
+Url: https://github.com/SUSE/zypper-migration
+Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.3.10
Requires: zypper >= 1.11.38
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: zypper >= 1.11.38
Source: zypper-migration-%{version}.tar.xz
Summary: Zypper subcommand for online migration
-License: GPL-2.0
+License: GPL-2.0-only
Group: System/Packages
BuildArch: noarch
Supplements: packageand(zypper:SUSEConnect)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration.8
new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration.8
--- old/zypper-migration-0.11.1520597355.bcf74ad/zypper-migration.8
2018-03-09 13:09:15.000000000 +0100
+++ new/zypper-migration-0.12.1529570802.4a668e3/zypper-migration.8
2018-06-21 10:46:42.000000000 +0200
@@ -64,6 +64,12 @@
.B --no-snapshots
Don't create snapshots during migration
.TP
+.B -p, --product PRODUCT
+Do an offline upgrade to PRODUCT. This requires the --root option.
+.TP
+.B --[no-]selfupdate
+Specify, if the update stack should update itself at first
+.TP
.B --root DIRECTORY
Operate on a different root directory.
.SH SEE ALSO
