Hello community,
here is the log from the commit of package zypper-migration-plugin for
openSUSE:Factory checked in at 2018-01-26 13:39:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 Jan 26 13:39:42 2018 rev:2 rq:569533 version:0.11.1516874532.fa20262
Changes:
--------
---
/work/SRC/openSUSE:Factory/zypper-migration-plugin/zypper-migration-plugin.changes
2017-03-17 15:06:18.423874552 +0100
+++
/work/SRC/openSUSE:Factory/.zypper-migration-plugin.new/zypper-migration-plugin.changes
2018-01-26 13:39:45.192583907 +0100
@@ -1,0 +2,6 @@
+Thu Jan 25 09:54:05 UTC 2018 - [email protected]
+
+- add --no-snapshots and --root options
+- version 0.11
+
+-------------------------------------------------------------------
Old:
----
zypper-migration-0.10.1488806253.1c712c3.tar.xz
New:
----
zypper-migration-0.11.1516874532.fa20262.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper-migration-plugin.spec ++++++
--- /var/tmp/diff_new_pack.kTAZmT/_old 2018-01-26 13:39:45.920549908 +0100
+++ /var/tmp/diff_new_pack.kTAZmT/_new 2018-01-26 13:39:45.928549535 +0100
@@ -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,12 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: zypper-migration-plugin
-Version: 0.10.1488806253.1c712c3
-URL: https://github.com/SUSE/zypper-migration
+Version: 0.11.1516874532.fa20262
Release: 0
-Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.24
+Url: https://github.com/SUSE/zypper-migration
Requires: zypper >= 1.11.38
+Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.24
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: zypper >= 1.11.38
++++++ _service ++++++
--- /var/tmp/diff_new_pack.kTAZmT/_old 2018-01-26 13:39:45.968547666 +0100
+++ /var/tmp/diff_new_pack.kTAZmT/_new 2018-01-26 13:39:45.968547666 +0100
@@ -4,7 +4,7 @@
<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.10</param>
+ <param name="versionprefix">0.11</param>
</service>
<service name="recompress" mode="disabled">
<param name="file">*.tar</param>
++++++ zypper-migration-0.10.1488806253.1c712c3.tar.xz ->
zypper-migration-0.11.1516874532.fa20262.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration
new/zypper-migration-0.11.1516874532.fa20262/zypper-migration
--- old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration
2017-03-06 14:17:33.000000000 +0100
+++ new/zypper-migration-0.11.1516874532.fa20262/zypper-migration
2018-01-25 11:02:12.000000000 +0100
@@ -115,7 +115,9 @@
:no_recommends => false,
:replacefiles => false,
:details => false,
- :download => nil
+ :download => nil,
+ :no_snapshots => false,
+ :root => nil
}
STDOUT.sync = true
@@ -193,6 +195,15 @@
options[:download] = "only" if d
end
+ opts.on("--no-snapshots", "Do not create snapshots.") do
+ options[:no_snapshots] = true
+ end
+
+ opts.on("--root DIR", "Operate on a different root directory") do |r|
+ options[:root] = r
+ SUSE::Connect::System.filesystem_root = r
+ end
+
end.parse!
cmd = "zypper " +
@@ -207,6 +218,7 @@
end
cmd = "zypper " +
+ (options[:root] ? "--root #{options[:root]} " : "") +
(options[:non_interactive] ? "--non-interactive " : "") +
(options[:verbose] ? "--verbose " : "") +
(options[:quiet] ? "--quiet " : "") +
@@ -216,6 +228,7 @@
if $?.exitstatus >= 100
# install pending updates and restart
cmd = "zypper " +
+ (options[:root] ? "--root #{options[:root]} " : "") +
(options[:non_interactive] ? "--non-interactive " : "") +
(options[:verbose] ? "--verbose " : "") +
(options[:quiet] ? "--quiet " : "") +
@@ -225,7 +238,10 @@
# stop infinite restarting
# check that the patches were really installed
- if ! system "zypper --non-interactive --quiet --no-refresh patch-check
--updatestack-only > /dev/null"
+ 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
@@ -329,7 +345,7 @@
end
-while migration_num <= 0 || migration_num > migrations.length do
+while migration_num <= 0 || migration_num > migrations.length do
print "Available migrations:\n\n"
migrations.each_with_index do |migration, index|
printf " %2d |", index + 1
@@ -344,7 +360,7 @@
end
while migration_num <= 0 || migration_num > migrations.length do
print "[num/q]: "
- choice = gets.chomp
+ choice = gets.chomp
exit 0 if choice.eql?("q") || choice.eql?("Q")
migration_num = choice.to_i
end
@@ -352,9 +368,11 @@
migration = migrations[migration_num - 1]
-cmd = "snapper create --type pre --cleanup-algorithm=number --print-number
--userdata important=yes --description 'before online migration'"
-print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
-pre_snapshot_num = `#{cmd}`.to_i
+if !options[:no_snapshots]
+ cmd = "snapper create --type pre --cleanup-algorithm=number --print-number
--userdata important=yes --description 'before online migration'"
+ print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
+ pre_snapshot_num = `#{cmd}`.to_i
+end
ENV['DISABLE_SNAPPER_ZYPP_PLUGIN'] = '1'
@@ -425,6 +443,7 @@
end
cmd = "zypper " +
+ (options[:root] ? "--root #{options[:root]} " : "") +
(base_product_version ? "--releasever #{base_product_version} " : "") +
"ref -f"
msg = "Executing '#{cmd}'"
@@ -435,6 +454,7 @@
raise "Interrupted." if interrupted
cmd = "zypper " +
+ (options[:root] ? "--root #{options[:root]} " : "") +
(base_product_version ? "--releasever #{base_product_version} " : "") +
(options[:non_interactive] ? "--non-interactive " : "") +
(options[:verbose] ? "--verbose " : "") +
@@ -474,7 +494,7 @@
exit 2
end
-if pre_snapshot_num > 0
+if !options[:no_snapshots] && pre_snapshot_num > 0
cmd = "snapper create --type post --pre-number #{pre_snapshot_num}
--cleanup-algorithm=number --print-number --userdata important=yes
--description 'after online migration'"
print "\nExecuting '#{cmd}'\n\n" unless options[:quiet]
post_snapshot_num = `#{cmd}`.to_i
@@ -515,5 +535,3 @@
end
exit 1 unless result
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration-plugin.changes
new/zypper-migration-0.11.1516874532.fa20262/zypper-migration-plugin.changes
---
old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration-plugin.changes
2017-03-06 14:17:33.000000000 +0100
+++
new/zypper-migration-0.11.1516874532.fa20262/zypper-migration-plugin.changes
2018-01-25 11:02:12.000000000 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+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)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration-plugin.spec
new/zypper-migration-0.11.1516874532.fa20262/zypper-migration-plugin.spec
--- old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration-plugin.spec
2017-03-06 14:17:33.000000000 +0100
+++ new/zypper-migration-0.11.1516874532.fa20262/zypper-migration-plugin.spec
2018-01-25 11:02:12.000000000 +0100
@@ -16,7 +16,7 @@
#
Name: zypper-migration-plugin
-Version: 0.10
+Version: 0.11
URL: https://github.com/SUSE/zypper-migration
Release: 0
Requires: rubygem(%{rb_default_ruby_abi}:suse-connect) >= 0.2.24
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration.8
new/zypper-migration-0.11.1516874532.fa20262/zypper-migration.8
--- old/zypper-migration-0.10.1488806253.1c712c3/zypper-migration.8
2017-03-06 14:17:33.000000000 +0100
+++ new/zypper-migration-0.11.1516874532.fa20262/zypper-migration.8
2018-01-25 11:02:12.000000000 +0100
@@ -58,10 +58,17 @@
.TP
.B --download-only
Replace repositories and download the packages, do not install. WARNING: This
leaves the system in inconsistent
-state with new repositories and old packages installed. Upgrade with 'zypper
dist-upgrade' as soon as possible.
+state with new repositories and old packages installed. Upgrade with 'zypper
+dist-upgrade' as soon as possible.
+.TP
+.B --no-snapshots
+Don't create snapshots during migration
+.TP
+.B --root DIRECTORY
+Operate on a different root directory.
.SH SEE ALSO
zypper(8)
.SH BUGS
No known bugs.
.SH AUTHOR
-Vladimir Nadvornik <[email protected]>
\ No newline at end of file
+Vladimir Nadvornik <[email protected]>