Hello community, here is the log from the commit of package yast2-journal for openSUSE:Factory checked in at 2020-11-23 15:36:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-journal (Old) and /work/SRC/openSUSE:Factory/.yast2-journal.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-journal" Mon Nov 23 15:36:18 2020 rev:16 rq:849647 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-journal/yast2-journal.changes 2019-08-27 15:56:01.623581442 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-journal.new.5913/yast2-journal.changes 2020-11-23 16:26:17.572486236 +0100 @@ -1,0 +2,7 @@ +Thu Nov 19 12:12:33 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- print properly help to avoid accidental opening of module by bash + completion (bsc#1172340) +- 4.3.0 + +------------------------------------------------------------------- Old: ---- yast2-journal-4.2.2.tar.bz2 New: ---- yast2-journal-4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-journal.spec ++++++ --- /var/tmp/diff_new_pack.C0eNwn/_old 2020-11-23 16:26:17.988487299 +0100 +++ /var/tmp/diff_new_pack.C0eNwn/_new 2020-11-23 16:26:17.992487309 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-journal # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,14 +12,14 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: yast2-journal -Version: 4.2.2 +Version: 4.3.0 Release: 0 -Url: https://github.com/yast/yast-journal +URL: https://github.com/yast/yast-journal Summary: YaST2 - Reading of systemd journal License: GPL-2.0-only OR GPL-3.0-only Group: System/YaST ++++++ yast2-journal-4.2.2.tar.bz2 -> yast2-journal-4.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-journal-4.2.2/package/yast2-journal.changes new/yast2-journal-4.3.0/package/yast2-journal.changes --- old/yast2-journal-4.2.2/package/yast2-journal.changes 2019-08-26 09:46:12.000000000 +0200 +++ new/yast2-journal-4.3.0/package/yast2-journal.changes 2020-11-20 12:28:55.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Nov 19 12:12:33 UTC 2020 - Josef Reidinger <jreidin...@suse.com> + +- print properly help to avoid accidental opening of module by bash + completion (bsc#1172340) +- 4.3.0 + +------------------------------------------------------------------- Mon Aug 26 09:20:29 CEST 2019 - sch...@suse.de - Using rb_default_ruby_abi tag in the spec file in order to diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-journal-4.2.2/package/yast2-journal.spec new/yast2-journal-4.3.0/package/yast2-journal.spec --- old/yast2-journal-4.2.2/package/yast2-journal.spec 2019-08-26 09:46:12.000000000 +0200 +++ new/yast2-journal-4.3.0/package/yast2-journal.spec 2020-11-20 12:28:55.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-journal -Version: 4.2.2 +Version: 4.3.0 Release: 0 Group: System/YaST License: GPL-2.0 or GPL-3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-journal-4.2.2/src/clients/journal.rb new/yast2-journal-4.3.0/src/clients/journal.rb --- old/yast2-journal-4.2.2/src/clients/journal.rb 2019-08-26 09:46:12.000000000 +0200 +++ new/yast2-journal-4.3.0/src/clients/journal.rb 2020-11-20 12:28:55.000000000 +0100 @@ -17,5 +17,10 @@ # you may find current contact information at www.suse.com require "y2journal/entries_dialog" +require "y2journal/cli" -Y2Journal::EntriesDialog.run +if Yast::WFM.Args.empty? + Y2Journal::EntriesDialog.run +else + Y2Journal::CLI.run +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-journal-4.2.2/src/lib/y2journal/cli.rb new/yast2-journal-4.3.0/src/lib/y2journal/cli.rb --- old/yast2-journal-4.2.2/src/lib/y2journal/cli.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-journal-4.3.0/src/lib/y2journal/cli.rb 2020-11-20 12:28:55.000000000 +0100 @@ -0,0 +1,42 @@ +# Copyright (c) 2014 SUSE LLC. +# All Rights Reserved. + +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 or 3 of the GNU General +# Public License as published by the Free Software Foundation. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact SUSE LLC. + +# To contact Novell about this file by physical or electronic mail, +# you may find current contact information at www.suse.com + +Yast.import "CommandLine" + +module Y2Journal + # CLI support for journal. It just recommends to run journalctl directly. + class CLI + extend Yast::I18n + + def self.run + textdomain "journal" + + msg = format( + _("Command line is not supported. Use '%s' directly."), + "journalctl" + ) + + cmdline_description = { + "id" => "journal", + "help" => msg + } + + Yast::CommandLine.Run(cmdline_description) + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-journal-4.2.2/test/cli_test.rb new/yast2-journal-4.3.0/test/cli_test.rb --- old/yast2-journal-4.2.2/test/cli_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-journal-4.3.0/test/cli_test.rb 2020-11-20 12:28:55.000000000 +0100 @@ -0,0 +1,32 @@ +#! /usr/bin/rspec +# Copyright (c) 2014 SUSE LLC. +# All Rights Reserved. + +# This program is free software; you can redistribute it and/or +# modify it under the terms of version 2 or 3 of the GNU General +# Public License as published by the Free Software Foundation. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, contact SUSE LLC. + +# To contact SUSE about this file by physical or electronic mail, +# you may find current contact information at www.suse.com + +require_relative "spec_helper" + +require "y2journal/cli" + +describe Y2Journal::CLI do + describe ".run" do + it "prints command line output" do + expect(Yast::CommandLine).to receive(:Run) + + described_class.run + end + end +end _______________________________________________ openSUSE Commits mailing list -- commit@lists.opensuse.org To unsubscribe, email commit-le...@lists.opensuse.org List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/commit@lists.opensuse.org
