Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2019-09-02 13:20:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new.7948 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Mon Sep 2 13:20:56 2019 rev:378 rq:726960 version:4.2.24 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2019-08-05 19:24:44.882148616 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new.7948/yast2-packager.changes 2019-09-02 13:20:57.805360595 +0200 @@ -1,0 +2,6 @@ +Wed Aug 28 12:59:14 UTC 2019 - José Iván López González <[email protected]> + +- Avoid error when generating some warnings (bsc#1148536). +- 4.2.24 + +------------------------------------------------------------------- Old: ---- yast2-packager-4.2.23.tar.bz2 New: ---- yast2-packager-4.2.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.A29Gqk/_old 2019-09-02 13:20:58.357360510 +0200 +++ /var/tmp/diff_new_pack.A29Gqk/_new 2019-09-02 13:20:58.361360510 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.23 +Version: 4.2.24 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later ++++++ yast2-packager-4.2.23.tar.bz2 -> yast2-packager-4.2.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.23/package/yast2-packager.changes new/yast2-packager-4.2.24/package/yast2-packager.changes --- old/yast2-packager-4.2.23/package/yast2-packager.changes 2019-08-05 16:42:24.000000000 +0200 +++ new/yast2-packager-4.2.24/package/yast2-packager.changes 2019-08-29 10:32:55.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Wed Aug 28 12:59:14 UTC 2019 - José Iván López González <[email protected]> + +- Avoid error when generating some warnings (bsc#1148536). +- 4.2.24 + +------------------------------------------------------------------- Mon Aug 5 08:23:58 UTC 2019 - David Diaz <[email protected]> - Select the forced base product during the repositories diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.23/package/yast2-packager.spec new/yast2-packager-4.2.24/package/yast2-packager.spec --- old/yast2-packager-4.2.23/package/yast2-packager.spec 2019-08-05 16:42:24.000000000 +0200 +++ new/yast2-packager-4.2.24/package/yast2-packager.spec 2019-08-29 10:32:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.23 +Version: 4.2.24 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.23/src/lib/packager/clients/software_proposal.rb new/yast2-packager-4.2.24/src/lib/packager/clients/software_proposal.rb --- old/yast2-packager-4.2.23/src/lib/packager/clients/software_proposal.rb 2019-08-05 16:42:24.000000000 +0200 +++ new/yast2-packager-4.2.24/src/lib/packager/clients/software_proposal.rb 2019-08-29 10:32:55.000000000 +0200 @@ -125,11 +125,13 @@ private # @param msg [String] warning message to be added + # + # @note The message could be a frozen string (e.g., translated messages). def add_warning_if_needed(msg) return if msg.empty? if @ret.key?("warning") - @ret["warning"] << "\n#{msg}" + @ret["warning"] += "\n#{msg}" else @ret["warning"] = msg end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.23/test/lib/clients/software_proposal_test.rb new/yast2-packager-4.2.24/test/lib/clients/software_proposal_test.rb --- old/yast2-packager-4.2.23/test/lib/clients/software_proposal_test.rb 2019-08-05 16:42:24.000000000 +0200 +++ new/yast2-packager-4.2.24/test/lib/clients/software_proposal_test.rb 2019-08-29 10:32:55.000000000 +0200 @@ -76,9 +76,17 @@ end it "returns warning message if second stage is not possible" do + # Note that translated errors can be frozen strings + error_message1 = "first_error".freeze + error_message2 = "second_error".freeze + + allow(Yast::Packages).to receive(:check_remote_installation_packages) + .and_return(error_message1) + allow(Yast::AutoinstData).to receive(:autoyast_second_stage_error) - .and_return("second_error") - expect(subject.make_proposal({})["warning"]).to include("second_error") + .and_return(error_message2) + + expect(subject.make_proposal({})["warning"]).to include(error_message2) end it "returns no warning if second stage is possible" do
