Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at 2018-11-01 18:56:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-add-on (Old) and /work/SRC/openSUSE:Factory/.yast2-add-on.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-add-on" Thu Nov 1 18:56:08 2018 rev:95 rq:642398 version:4.1.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-add-on/yast2-add-on.changes 2018-09-04 22:51:24.372022454 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-add-on.new/yast2-add-on.changes 2018-11-01 18:56:09.973972136 +0100 @@ -1,0 +2,13 @@ +Tue Oct 16 13:17:31 CEST 2018 - [email protected] + +- Fixed path to license file. . Build error in bsc#1108139. +- 4.1.7 + +------------------------------------------------------------------- +Wed Sep 12 15:50:58 UTC 2018 - [email protected] + +- Fix and improve the repo name selection in the AddOn auto client + (bsc#1108139) +- 4.1.6 + +------------------------------------------------------------------- Old: ---- yast2-add-on-4.1.5.tar.bz2 New: ---- yast2-add-on-4.1.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.o9YX21/_old 2018-11-01 18:56:10.397972179 +0100 +++ /var/tmp/diff_new_pack.o9YX21/_new 2018-11-01 18:56:10.397972179 +0100 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.1.5 +Version: 4.1.7 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only @@ -72,7 +72,7 @@ %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc %dir %{yast_docdir} -%license %{yast_docdir}/COPYING +%license COPYING %doc %{yast_docdir}/CONTRIBUTING.md %doc %{yast_docdir}/README.md ++++++ yast2-add-on-4.1.5.tar.bz2 -> yast2-add-on-4.1.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/package/yast2-add-on.changes new/yast2-add-on-4.1.7/package/yast2-add-on.changes --- old/yast2-add-on-4.1.5/package/yast2-add-on.changes 2018-08-31 09:28:43.000000000 +0200 +++ new/yast2-add-on-4.1.7/package/yast2-add-on.changes 2018-10-16 17:42:40.000000000 +0200 @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Tue Oct 16 13:17:31 CEST 2018 - [email protected] + +- Fixed path to license file. . Build error in bsc#1108139. +- 4.1.7 + +------------------------------------------------------------------- +Wed Sep 12 15:50:58 UTC 2018 - [email protected] + +- Fix and improve the repo name selection in the AddOn auto client + (bsc#1108139) +- 4.1.6 + +------------------------------------------------------------------- Thu Aug 30 08:50:09 UTC 2018 - [email protected] - Fix the run of AddOn auto client (bsc#1106536). diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/package/yast2-add-on.spec new/yast2-add-on-4.1.7/package/yast2-add-on.spec --- old/yast2-add-on-4.1.5/package/yast2-add-on.spec 2018-08-31 09:28:43.000000000 +0200 +++ new/yast2-add-on-4.1.7/package/yast2-add-on.spec 2018-10-16 17:42:40.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-add-on -Version: 4.1.5 +Version: 4.1.7 Release: 0 Summary: YaST2 - Add-On media installation code License: GPL-2.0-only @@ -72,7 +72,7 @@ %{yast_desktopdir}/*.desktop %{yast_schemadir}/autoyast/rnc/add-on.rnc %dir %{yast_docdir} -%license %{yast_docdir}/COPYING +%license COPYING %doc %{yast_docdir}/CONTRIBUTING.md %doc %{yast_docdir}/README.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/src/lib/add-on/clients/add-on_auto.rb new/yast2-add-on-4.1.7/src/lib/add-on/clients/add-on_auto.rb --- old/yast2-add-on-4.1.5/src/lib/add-on/clients/add-on_auto.rb 2018-08-31 09:28:43.000000000 +0200 +++ new/yast2-add-on-4.1.7/src/lib/add-on/clients/add-on_auto.rb 2018-10-16 17:42:40.000000000 +0200 @@ -324,12 +324,12 @@ add_on_name = add_on.fetch("name", nil) # name in control file, bnc#433981 - return add_on_name unless add_on_name.nil? || add_on_name.empty? + return add_on_name unless add_on_name.to_s.empty? - media = add_on.fetch("media") - product_dir = add_on.fetch("product_dir") - expanded_url = Pkg.ExpandedUrl(media) - repos_at_url = Pkg.RepositoryScan(expanded_url) + media_url = add_on.fetch("media_url", "") + product_dir = add_on.fetch("product_dir", "/") + expanded_url = Pkg.ExpandedUrl(media_url) + repos_at_url = Pkg.RepositoryScan(expanded_url) || [] # {Pkg.RepositoryScan} output: [["Product Name", "Path"], ...] found_repo = repos_at_url.find { |r| r[1] == product_dir } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-add-on-4.1.5/test/y2add_on/clients/add-on_auto_test.rb new/yast2-add-on-4.1.7/test/y2add_on/clients/add-on_auto_test.rb --- old/yast2-add-on-4.1.5/test/y2add_on/clients/add-on_auto_test.rb 2018-08-31 09:28:43.000000000 +0200 +++ new/yast2-add-on-4.1.7/test/y2add_on/clients/add-on_auto_test.rb 2018-10-16 17:42:40.000000000 +0200 @@ -245,7 +245,6 @@ "alias" => "produc_alias", "ask_on_error" => ask_on_error, "media_url" => "RELURL://product.url", - "name" => "updated_repo", "priority" => 20, "product_dir" => "/" } @@ -258,7 +257,7 @@ "autorefresh" => true, "enabled" => true, "keeppackaged" => false, - "name" => "updated_repo", + "name" => "Updated repo", "priority" => 20, "service" => "" }, @@ -279,9 +278,13 @@ allow(Yast::Pkg).to receive(:SourceEditSet) allow(Yast::Pkg).to receive(:SourceCreate).and_return(1) allow(Yast::Pkg).to receive(:SourceEditGet).and_return(repos) + allow(Yast::Pkg).to receive(:ExpandedUrl) + # To test indirectly the "preferred_name_for" method + allow(Yast::Pkg).to receive(:RepositoryScan) + .with(anything) + .and_return([["Updated repo", "/"]]) end - # FIXME: improve that WIP scenarios/contexts context "and product creation fails" do before do allow(Yast::Pkg).to receive(:SourceCreate).and_return(-1)
