Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2020-03-14 09:54:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Sat Mar 14 09:54:36 2020 rev:389 rq:783489 version:4.2.58 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2020-03-07 21:36:54.120218002 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new.3160/yast2-packager.changes 2020-03-14 09:54:39.823080334 +0100 @@ -1,0 +2,13 @@ +Fri Mar 6 09:11:15 UTC 2020 - Ladislav Slezák <[email protected]> + +- Avoid unselecting the base product (related to bsc#1165501) +- 4.2.58 + +------------------------------------------------------------------- +Thu Mar 5 16:21:35 UTC 2020 - José Iván López González <[email protected]> + +- Avoid to abort the installer when the user decides to not fix a + repository url (bsc#1163015). +- 4.2.57 + +------------------------------------------------------------------- Old: ---- yast2-packager-4.2.56.tar.bz2 New: ---- yast2-packager-4.2.58.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.xJu3hF/_old 2020-03-14 09:54:40.551080868 +0100 +++ /var/tmp/diff_new_pack.xJu3hF/_new 2020-03-14 09:54:40.555080871 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.56 +Version: 4.2.58 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later ++++++ yast2-packager-4.2.56.tar.bz2 -> yast2-packager-4.2.58.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.56/package/yast2-packager.changes new/yast2-packager-4.2.58/package/yast2-packager.changes --- old/yast2-packager-4.2.56/package/yast2-packager.changes 2020-03-04 14:00:45.000000000 +0100 +++ new/yast2-packager-4.2.58/package/yast2-packager.changes 2020-03-06 13:22:46.000000000 +0100 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Mar 6 09:11:15 UTC 2020 - Ladislav Slezák <[email protected]> + +- Avoid unselecting the base product (related to bsc#1165501) +- 4.2.58 + +------------------------------------------------------------------- +Thu Mar 5 16:21:35 UTC 2020 - José Iván López González <[email protected]> + +- Avoid to abort the installer when the user decides to not fix a + repository url (bsc#1163015). +- 4.2.57 + +------------------------------------------------------------------- Wed Mar 4 11:34:30 UTC 2020 - Josef Reidinger <[email protected]> - fix showing count of packages to install in slide show diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.56/package/yast2-packager.spec new/yast2-packager-4.2.58/package/yast2-packager.spec --- old/yast2-packager-4.2.56/package/yast2-packager.spec 2020-03-04 14:00:45.000000000 +0100 +++ new/yast2-packager-4.2.58/package/yast2-packager.spec 2020-03-06 13:22:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.2.56 +Version: 4.2.58 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.56/src/include/packager/repositories_include.rb new/yast2-packager-4.2.58/src/include/packager/repositories_include.rb --- old/yast2-packager-4.2.56/src/include/packager/repositories_include.rb 2020-03-04 14:00:45.000000000 +0100 +++ new/yast2-packager-4.2.58/src/include/packager/repositories_include.rb 2020-03-06 13:22:46.000000000 +0100 @@ -53,10 +53,12 @@ # with this alias already exists then it is overwritten, use empty string "" # to generate an unique alias # @return [Symbol] the result - # :ok => successfully added - # :again => failed, but user wants to edit the URL and try again + # :ok => successfully added + # :again => failed, but user wants to edit the URL and try again + # :next => continue in the workflow # :cancel => failed, don't retry - # :abort => repository added successfully, but user rejected the license + # :abort => repository added successfully, but user rejected the license + # # TODO: abort is problematic as abort is used to abort installation, for license # should be own symbol. Now abort in addon view in upgrade proposal ask for abort # properly, but then just go back to proposal instead of full abort. @@ -185,7 +187,7 @@ if newSources.empty? log.error("Cannot add the repository") - try_again(url, scheme) ? :again : :cancel + try_again(url, scheme) ? :again : :next else Progress.NextStage Builtins.foreach(newSources) do |id| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.56/src/lib/y2packager/clients/inst_repositories_initialization.rb new/yast2-packager-4.2.58/src/lib/y2packager/clients/inst_repositories_initialization.rb --- old/yast2-packager-4.2.56/src/lib/y2packager/clients/inst_repositories_initialization.rb 2020-03-04 14:00:45.000000000 +0100 +++ new/yast2-packager-4.2.58/src/lib/y2packager/clients/inst_repositories_initialization.rb 2020-03-06 13:22:46.000000000 +0100 @@ -126,7 +126,7 @@ elsif products.size == 1 products.first.select else - products.each(&:restore) + products.each(&:restore) unless Y2Packager::MediumType.online? end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.2.56/test/repositories_include_test.rb new/yast2-packager-4.2.58/test/repositories_include_test.rb --- old/yast2-packager-4.2.56/test/repositories_include_test.rb 2020-03-04 14:00:45.000000000 +0100 +++ new/yast2-packager-4.2.58/test/repositories_include_test.rb 2020-03-06 13:22:46.000000000 +0100 @@ -91,6 +91,36 @@ end end + context "when the repository cannot be created" do + before do + allow(Yast::Pkg).to receive(:RepositoryProbe).and_return(nil) + end + + context "and the user accepts to edit the URL" do + before do + allow(Yast::Popup).to receive(:YesNo).and_return(true) + end + + it "returns :again symbol" do + result = RepositoryIncludeTester.createSource(url, plaindir, download, preffered_name) + + expect(result).to eq(:again) + end + end + + context "and the user does not accept to edit the URL" do + before do + allow(Yast::Popup).to receive(:YesNo).and_return(false) + end + + it "returns :next symbol" do + result = RepositoryIncludeTester.createSource(url, plaindir, download, preffered_name) + + expect(result).to eq(:next) + end + end + end + it "creates the repository" do repo_props = { "enabled" => true, "autorefresh" => false,
