Hello community,
here is the log from the commit of package zypper-lifecycle-plugin for
openSUSE:Factory checked in at 2020-08-10 14:57:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/zypper-lifecycle-plugin (Old)
and /work/SRC/openSUSE:Factory/.zypper-lifecycle-plugin.new.3399 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "zypper-lifecycle-plugin"
Mon Aug 10 14:57:37 2020 rev:5 rq:824845 version:0.6.1596796104.87bdab7
Changes:
--------
---
/work/SRC/openSUSE:Factory/zypper-lifecycle-plugin/zypper-lifecycle-plugin.changes
2017-12-01 15:53:56.403385194 +0100
+++
/work/SRC/openSUSE:Factory/.zypper-lifecycle-plugin.new.3399/zypper-lifecycle-plugin.changes
2020-08-10 14:57:53.815997284 +0200
@@ -1,0 +2,8 @@
+Fri Aug 7 10:31:01 UTC 2020 - Vladimir Nadvornik <[email protected]>
+
+- Version 0.6.1596796104.87bdab7
+- Handle zypper errors (bsc#1174369)
+- Fix ruby warning (bsc#1173714)
+- Handle all times in UTC (bsc#1143453)
+
+-------------------------------------------------------------------
Old:
----
zypper-lifecycle-0.6.1490613702.a925823.tar.xz
New:
----
zypper-lifecycle-0.6.1596796104.87bdab7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ zypper-lifecycle-plugin.spec ++++++
--- /var/tmp/diff_new_pack.V642cg/_old 2020-08-10 14:57:55.191998011 +0200
+++ /var/tmp/diff_new_pack.V642cg/_new 2020-08-10 14:57:55.195998013 +0200
@@ -1,7 +1,7 @@
#
# spec file for package zypper-lifecycle-plugin
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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
@@ -23,7 +23,7 @@
Name: zypper-lifecycle-plugin
Url: https://github.com/SUSE/zypper-lifecycle
-Version: 0.6.1490613702.a925823
+Version: 0.6.1596796104.87bdab7
Release: 0
Requires: zypper >= 1.13.10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
++++++ _service ++++++
--- /var/tmp/diff_new_pack.V642cg/_old 2020-08-10 14:57:55.231998032 +0200
+++ /var/tmp/diff_new_pack.V642cg/_new 2020-08-10 14:57:55.231998032 +0200
@@ -2,7 +2,7 @@
<service name="tar_scm" mode="disabled">
<param name="url">https://github.com/SUSE/zypper-lifecycle</param>
<param name="scm">git</param>
- <param name="extract">zypper-lifecycle-plugin.changes</param>
+ <param name="extract">zypper-lifecycle-plugin.spec</param>
<param name="versionprefix">0.6</param>
</service>
<service name="recompress" mode="disabled">
++++++ zypper-lifecycle-0.6.1490613702.a925823.tar.xz ->
zypper-lifecycle-0.6.1596796104.87bdab7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle
new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle
--- old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle
2017-03-27 13:21:42.000000000 +0200
+++ new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle
2020-08-07 12:28:24.000000000 +0200
@@ -12,6 +12,12 @@
module Zypper
class << self
+ def print_messages(xml_doc)
+ xml_doc.root.elements.each("message") do |e|
+ print e[0].value, "\n"
+ end
+ end
+
def call(args, quiet = true)
cmd = "zypper #{args}"
output, error, status = Open3.capture3({ 'LC_ALL' => 'C' }, cmd)
{|_stdin, stdout, _stderr, _wait_thr| stdout.read }
@@ -21,9 +27,18 @@
# Catching interactive failures of zypper. --non-interactive always
returns with exit code 0 here
if !valid_exit_codes.include?(status.exitstatus) ||
error.include?('ABORT request')
error = error.empty? ? output.strip : error.strip
- print error
-# e = (cmd.include? 'zypper') ?
Connect::ZypperError.new(status.exitstatus, error) : Connect::SystemCallError
-# raise e, error
+ begin
+ if error.start_with?("<?xml")
+ xml_doc = REXML::Document.new(error)
+ print_messages(xml_doc)
+ error = nil
+ end
+ rescue
+ # ignore
+ end
+
+ print "#{error}\n" if !error.nil?
+ exit(status.exitstatus)
end
output.strip unless quiet
end
@@ -149,7 +164,7 @@
].each do |file|
print "trying to load #{file}... " if @verbose
begin
- CSV.foreach(file, {:skip_blanks => true, :skip_lines => /^\s*#/ })
do |line|
+ CSV.foreach(file, :skip_blanks => true, :skip_lines => /^\s*#/ )
do |line|
name, version, date = line.map(&:strip)
date = Time.parse(date).strftime("%s")
version_re = Regexp.new( '^' +
Regexp.quote(version).gsub(/\\\*/, '.*') + '$')
@@ -274,7 +289,7 @@
printf(ProductFormatStr, "Codestream: " +
p[:xmlfwd_codestream_name], eol_string(p[:codestream_endoflife_time_t], vendor))
@printed_codestream = p[:xmlfwd_codestream_name]
end
- printf(ProductFormatStr, " " + p[:summary],
eol_string(p[:endoflife_time_t], vendor))
+ printf(ProductFormatStr, " Product: " + p[:summary],
eol_string(p[:endoflife_time_t], vendor))
else
printf(ProductFormatStr, p[:summary], eol_string(p[:endoflife_time_t],
vendor))
@printed_codestream = nil
@@ -428,6 +443,9 @@
end
end
+# handle all times in UTC (bsc#1143453)
+ENV['TZ'] = "UTC"
+
options = {}
OptionParser.new do |opts|
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle-plugin.changes
new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle-plugin.changes
--- old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle-plugin.changes
2017-03-27 13:21:42.000000000 +0200
+++ new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle-plugin.changes
1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
--------------------------------------------------------------------
-Fri Mar 24 12:45:29 UTC 2017 - [email protected]
-
-- do not show version number by default (fate#322212)
-
--------------------------------------------------------------------
-Wed Mar 8 13:32:47 UTC 2017 - [email protected]
-
-- fixed unhandled exception on empty package list (bsc#1028247#c1)
-
--------------------------------------------------------------------
-Thu Mar 2 13:34:03 UTC 2017 - [email protected]
-
-- version 0.6
-- save state and report changes since saved state (fate#322059)
-- added systemd timer for periodical reports (fate#322059)
-- look for lifecycle data also in /usr (bsc#1014622)
-- support also openSUSE vendor (bsc#1014620)
-
--------------------------------------------------------------------
-Mon Sep 26 09:01:46 UTC 2016 - [email protected]
-
-- version 0.5
-- consider also codestream in date/days argument (bsc#999537)
-- handle missing codestream name (bsc#1000595)
-
--------------------------------------------------------------------
-Tue Sep 13 12:05:26 UTC 2016 - [email protected]
-
-- version 0.4
-- handle codestream info (fate#320835)
-- clarify help text (bnc#981106)
-
--------------------------------------------------------------------
-Tue Jul 26 10:43:22 UTC 2016 - [email protected]
-
-- version 0.3
-- use product eol according to FATE#320699
-- adjust output
-
--------------------------------------------------------------------
-Fri May 13 08:32:03 UTC 2016 - [email protected]
-
-- version 0.2
-- fixed return value (bsc#979322)
-- do not ignore errors on parsing of lifecycle data (bsc#979431)
-
--------------------------------------------------------------------
-Fri May 6 09:30:32 UTC 2016 - [email protected]
-
-- initial version 0.1 (fate#320597)
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle-plugin.spec
new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle-plugin.spec
--- old/zypper-lifecycle-0.6.1490613702.a925823/zypper-lifecycle-plugin.spec
2017-03-27 13:21:42.000000000 +0200
+++ new/zypper-lifecycle-0.6.1596796104.87bdab7/zypper-lifecycle-plugin.spec
2020-08-07 12:28:24.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package zypper-lifecycle
+# spec file for package zypper-lifecycle-plugin
#
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 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,16 +15,22 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
+#Compat macro for new _fillupdir macro introduced in Nov 2017
+%if ! %{defined _fillupdir}
+ %define _fillupdir /var/adm/fillup-templates
+%endif
+
Name: zypper-lifecycle-plugin
-URL: https://github.com/SUSE/zypper-lifecycle
-Version: 0.6
+Url: https://github.com/SUSE/zypper-lifecycle
+Version: 0.6.1490613702.a925823
Release: 0
Requires: zypper >= 1.13.10
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: ruby-macros >= 5
BuildRequires: zypper >= 1.13.10
%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros
+BuildRequires: systemd-rpm-macros
%endif
%{?systemd_requires}
@@ -53,8 +59,7 @@
mkdir -p %{buildroot}/usr/lib/systemd/system
install -m 644 lifecycle-report.service %{buildroot}%{_unitdir}
install -m 644 lifecycle-report.timer %{buildroot}%{_unitdir}
-install -D -m 644 sysconfig.lifecycle-report
%{buildroot}/var/adm/fillup-templates/sysconfig.lifecycle-report
-
+install -D -m 644 sysconfig.lifecycle-report
%{buildroot}%{_fillupdir}/sysconfig.lifecycle-report
%pre
%service_add_pre lifecycle-report.service lifecycle-report.timer
@@ -76,6 +81,6 @@
/var/lib/lifecycle
%{_mandir}/man8/*
%{_unitdir}/*
-/var/adm/fillup-templates/*
+%{_fillupdir}/*
%changelog
