Hello community,
here is the log from the commit of package yast2-journal for openSUSE:Factory
checked in at 2017-03-16 09:41:43
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-journal (Old)
and /work/SRC/openSUSE:Factory/.yast2-journal.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-journal"
Thu Mar 16 09:41:43 2017 rev:6 rq:478994 version:3.2.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-journal/yast2-journal.changes
2015-08-21 07:40:59.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.yast2-journal.new/yast2-journal.changes
2017-03-16 09:50:51.679516436 +0100
@@ -1,0 +2,6 @@
+Mon Mar 13 09:42:03 UTC 2017 - an...@suse.com
+
+- Fixed RPM packaging error (bsc#1029088)
+- 3.2.0
+
+-------------------------------------------------------------------
Old:
----
yast2-journal-3.1.2.tar.bz2
New:
----
yast2-journal-3.2.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-journal.spec ++++++
--- /var/tmp/diff_new_pack.BWtFjT/_old 2017-03-16 09:50:52.259434309 +0100
+++ /var/tmp/diff_new_pack.BWtFjT/_new 2017-03-16 09:50:52.259434309 +0100
@@ -1,7 +1,7 @@
#
# spec file for package yast2-journal
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -17,7 +17,7 @@
Name: yast2-journal
-Version: 3.1.2
+Version: 3.2.0
Release: 0
BuildArch: noarch
@@ -67,6 +67,7 @@
%{yast_desktopdir}/journal.desktop
%doc COPYING
+%doc README.md
%build
++++++ yast2-journal-3.1.2.tar.bz2 -> yast2-journal-3.2.0.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/.travis.yml
new/yast2-journal-3.2.0/.travis.yml
--- old/yast2-journal-3.1.2/.travis.yml 2015-07-31 15:42:27.128994867 +0200
+++ new/yast2-journal-3.2.0/.travis.yml 2017-03-13 10:54:34.728558165 +0100
@@ -1,13 +1,11 @@
-language: ruby
+sudo: required
+language: bash
+services:
+ - docker
+
before_install:
-# disable rvm, use system Ruby
-- rvm reset
-- wget
https://raw.githubusercontent.com/yast/yast-devtools/master/travis-tools/travis_setup.sh
-- sh ./travis_setup.sh -p "yast2-devtools yast2 rake" -g "rspec:3.3.0
yast-rake gettext simplecov coveralls rubocop:0.29.1"
+ - docker build -t yast-journal-image .
script:
-- rake check:pot
-- rubocop
-- yardoc
-- COVERAGE=1 rake test:unit
-- sudo rake install
-
+ # the "yast-travis-ruby" script is included in the base yastdevel/ruby image
+ # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby
+ - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID"
yast-journal-image yast-travis-ruby
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/Dockerfile
new/yast2-journal-3.2.0/Dockerfile
--- old/yast2-journal-3.1.2/Dockerfile 1970-01-01 01:00:00.000000000 +0100
+++ new/yast2-journal-3.2.0/Dockerfile 2017-03-13 10:54:34.740558165 +0100
@@ -0,0 +1,3 @@
+FROM yastdevel/ruby
+COPY . /usr/src/app
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/package/yast2-journal.changes
new/yast2-journal-3.2.0/package/yast2-journal.changes
--- old/yast2-journal-3.1.2/package/yast2-journal.changes 2015-08-18
16:12:08.446636903 +0200
+++ new/yast2-journal-3.2.0/package/yast2-journal.changes 2017-03-13
10:54:34.748558165 +0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Mar 13 09:42:03 UTC 2017 - an...@suse.com
+
+- Fixed RPM packaging error (bsc#1029088)
+- 3.2.0
+
+-------------------------------------------------------------------
Tue Aug 18 13:47:54 UTC 2015 - an...@suse.com
- Handle strange journal entries with non-textual messages
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/package/yast2-journal.spec
new/yast2-journal-3.2.0/package/yast2-journal.spec
--- old/yast2-journal-3.1.2/package/yast2-journal.spec 2015-08-18
16:12:08.446636903 +0200
+++ new/yast2-journal-3.2.0/package/yast2-journal.spec 2017-03-13
10:54:34.748558165 +0100
@@ -17,7 +17,7 @@
Name: yast2-journal
-Version: 3.1.2
+Version: 3.2.0
Release: 0
BuildArch: noarch
@@ -67,5 +67,6 @@
%{yast_desktopdir}/journal.desktop
%doc COPYING
+%doc README.md
%build
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-3.1.2/src/lib/systemd_journal/entries_dialog.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/entries_dialog.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/entries_dialog.rb
2015-07-31 15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/entries_dialog.rb
2017-03-13 10:54:34.756558165 +0100
@@ -83,7 +83,7 @@
redraw_table
end
- private
+ private
# Table widget (plus wrappers) to display log entries
def table
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/src/lib/systemd_journal/entry.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/entry.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/entry.rb 2015-07-31
15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/entry.rb 2017-03-13
10:54:34.764558165 +0100
@@ -27,7 +27,7 @@
:syslog_id, :unit, :machine_id, :hostname, :message
# Used internally to get the entries in a parseable format
- JOURNALCTL_OPTS = { "no-pager" => nil, "output" => "json" }
+ JOURNALCTL_OPTS = { "no-pager" => nil, "output" => "json" }.freeze
def initialize(json)
@raw = JSON.parse(json)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-3.1.2/src/lib/systemd_journal/entry_presenter.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/entry_presenter.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/entry_presenter.rb
2015-08-18 16:12:08.446636903 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/entry_presenter.rb
2017-03-13 10:54:34.764558165 +0100
@@ -23,7 +23,7 @@
module SystemdJournal
# Presenter for Entry adding useful methods for the dialogs
class EntryPresenter < SimpleDelegator
- TIME_FORMAT = "%b %d %H:%M:%S"
+ TIME_FORMAT = "%b %d %H:%M:%S".freeze
def initialize(entry)
__setobj__(entry)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-3.1.2/src/lib/systemd_journal/journalctl.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/journalctl.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/journalctl.rb
2015-07-31 15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/journalctl.rb
2017-03-13 10:54:34.772558165 +0100
@@ -22,12 +22,12 @@
# Agent used internally
BASH_SCR_PATH = Yast::Path.new(".target.bash_output")
# Base journalctl command
- COMMAND = "LANG=C journalctl"
+ COMMAND = "LANG=C journalctl".freeze
# Format understood by journalctl options
- TIME_FORMAT = "%Y-%m-%d %H:%M:%S"
+ TIME_FORMAT = "%Y-%m-%d %H:%M:%S".freeze
# Ordered list of priority values supported by journalctl
PRIORITIES = ["emerg", "alert", "crit", "err",
- "warning", "notice", "info", "debug"]
+ "warning", "notice", "info", "debug"].freeze
attr_reader :options, :matches
@@ -67,17 +67,15 @@
if cmd_result["exit"].zero?
cmd_result["stdout"]
+ elsif cmd_result["stderr"] =~ /^Failed to .* timestamp:/
+ # Most likely, journalctl bug when an empty list is found
+ ""
else
- if cmd_result["stderr"] =~ /^Failed to .* timestamp:/
- # Most likely, journalctl bug when an empty list is found
- ""
- else
- raise "Calling journalctl failed: #{cmd_result["stderr"]}"
- end
+ raise "Calling journalctl failed: #{cmd_result["stderr"]}"
end
end
- private
+ private
def options_string
return @options_string if @option_string
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/src/lib/systemd_journal/query.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/query.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/query.rb 2015-07-31
15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/query.rb 2017-03-13
10:54:34.772558165 +0100
@@ -23,7 +23,7 @@
# A more convenient interface to journalctl options
class Query
# Valid keys for the filter hash
- VALID_FILTERS = ["unit", "priority", "match"]
+ VALID_FILTERS = ["unit", "priority", "match"].freeze
attr_reader :interval, :filters
# @return [Hash] options in the format expected by Journalctl
@@ -56,10 +56,10 @@
@filters = filters
@interval = interval
- if filters["match"].nil?
- @journalctl_matches = []
+ @journalctl_matches = if filters["match"].nil?
+ []
else
- @journalctl_matches = [filters["match"]].flatten
+ [filters["match"]].flatten
end
calculate_options
@@ -105,7 +105,7 @@
end
end
- private
+ private
def calculate_options
@journalctl_options = {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-3.1.2/src/lib/systemd_journal/query_dialog.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/query_dialog.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/query_dialog.rb
2015-07-31 15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/query_dialog.rb
2017-03-13 10:54:34.784558165 +0100
@@ -94,7 +94,7 @@
define_event_callbacks
- private
+ private
# Translates the value of the widgets to a new QueryPresenter object
def query_from_widgets
@@ -140,10 +140,10 @@
#
# @param int [Hash] interval as returned by QueryPresenter.intervals
def interval_button(int)
- if int[:value] == Hash
- selected = @query.interval.is_a?(Hash)
+ selected = if int[:value] == Hash
+ @query.interval.is_a?(Hash)
else
- selected = int[:value] == @query.interval
+ int[:value] == @query.interval
end
RadioButton(Id(int[:value].to_s), int[:label], selected)
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/yast2-journal-3.1.2/src/lib/systemd_journal/query_presenter.rb
new/yast2-journal-3.2.0/src/lib/systemd_journal/query_presenter.rb
--- old/yast2-journal-3.1.2/src/lib/systemd_journal/query_presenter.rb
2015-07-31 15:42:27.132994867 +0200
+++ new/yast2-journal-3.2.0/src/lib/systemd_journal/query_presenter.rb
2017-03-13 10:54:34.792558165 +0100
@@ -28,7 +28,7 @@
extend Yast::I18n
textdomain "journal"
- TIME_FORMAT = "%b %d %H:%M:%S"
+ TIME_FORMAT = "%b %d %H:%M:%S".freeze
def initialize(args = {})
textdomain "journal"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/yast2-journal-3.1.2/test/spec_helper.rb
new/yast2-journal-3.2.0/test/spec_helper.rb
--- old/yast2-journal-3.1.2/test/spec_helper.rb 2015-07-31 15:42:27.132994867
+0200
+++ new/yast2-journal-3.2.0/test/spec_helper.rb 2017-03-13 10:54:34.844558165
+0100
@@ -46,7 +46,7 @@
# Stubbed result of calling a command
def cmd_result_for(name)
file = File.join(DATA_PATH, "#{name}.out")
- content = File.open(file, encoding: "UTF-8") { |f| f.read }
+ content = File.open(file, encoding: "UTF-8", &:read)
{ "exit" => 0, "stderr" => "", "stdout" => content }
end
@@ -75,5 +75,5 @@
# JSON chunk describing a given entry, read from the example data directory
def json_for(name)
file = File.join(DATA_PATH, "#{name}-entry.json")
- File.open(file, encoding: "UTF-8") { |f| f.read }
+ File.open(file, encoding: "UTF-8", &:read)
end
