Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-packager for openSUSE:Factory checked in at 2022-11-18 15:42:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-packager (Old) and /work/SRC/openSUSE:Factory/.yast2-packager.new.1597 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-packager" Fri Nov 18 15:42:41 2022 rev:430 rq:1034132 version:4.5.8 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-packager/yast2-packager.changes 2022-10-28 19:29:19.550569802 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-packager.new.1597/yast2-packager.changes 2022-11-18 15:42:46.610362731 +0100 @@ -1,0 +2,14 @@ +Mon Nov 7 10:06:19 UTC 2022 - Ladislav Slezák <lsle...@suse.cz> + +- Do not add an empty repository to the system when upgrading + a registered system using the Full installation medium + (bsc#1204399) +- 4.5.8 + +------------------------------------------------------------------- +Mon Oct 31 15:44:55 UTC 2022 - Martin Vidner <mvid...@suse.com> + +- Fix hash vs keyword arguments in RSpec expectations (bsc#1204871) +- 4.5.7 + +------------------------------------------------------------------- Old: ---- yast2-packager-4.5.6.tar.bz2 New: ---- yast2-packager-4.5.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-packager.spec ++++++ --- /var/tmp/diff_new_pack.K4Rbsf/_old 2022-11-18 15:42:47.258365579 +0100 +++ /var/tmp/diff_new_pack.K4Rbsf/_new 2022-11-18 15:42:47.262365596 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.5.6 +Version: 4.5.8 Release: 0 Summary: YaST2 - Package Library License: GPL-2.0-or-later ++++++ yast2-packager-4.5.6.tar.bz2 -> yast2-packager-4.5.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.5.6/package/yast2-packager.changes new/yast2-packager-4.5.8/package/yast2-packager.changes --- old/yast2-packager-4.5.6/package/yast2-packager.changes 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/package/yast2-packager.changes 2022-11-07 11:12:39.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Mon Nov 7 10:06:19 UTC 2022 - Ladislav Slezák <lsle...@suse.cz> + +- Do not add an empty repository to the system when upgrading + a registered system using the Full installation medium + (bsc#1204399) +- 4.5.8 + +------------------------------------------------------------------- +Mon Oct 31 15:44:55 UTC 2022 - Martin Vidner <mvid...@suse.com> + +- Fix hash vs keyword arguments in RSpec expectations (bsc#1204871) +- 4.5.7 + +------------------------------------------------------------------- Tue Oct 25 10:20:48 UTC 2022 - Steffen Winterfeldt <snw...@suse.com> - support 'repo' scheme for add-ons (jsc#SLE-22578, jsc#SLE-24584) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.5.6/package/yast2-packager.spec new/yast2-packager-4.5.8/package/yast2-packager.spec --- old/yast2-packager-4.5.6/package/yast2-packager.spec 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/package/yast2-packager.spec 2022-11-07 11:12:39.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-packager -Version: 4.5.6 +Version: 4.5.8 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.5.6/src/lib/y2packager/medium_type.rb new/yast2-packager-4.5.8/src/lib/y2packager/medium_type.rb --- old/yast2-packager-4.5.6/src/lib/y2packager/medium_type.rb 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/src/lib/y2packager/medium_type.rb 2022-11-07 11:12:39.000000000 +0100 @@ -28,9 +28,9 @@ # URL is not set (nil) or is empty. # # @return [Symbol] Symbol describing the medium, one of `:offline`, - # `:online` or `:standard` + # `:online` or `:standard` def type - @type ||= detect_medium_type + @type ||= detected_type end # Returns the cached medium type value. If the medium detection has not been @@ -42,6 +42,17 @@ @type end + # Similar to {.type} method, but returns the cached original value of the + # detected medium type. Useful after changing the type via `type=` method. + # Raises an exception if the installation URL is not set (`nil`) or is empty. + # + # @see .type + # @return [Symbol] Symbol describing the medium, one of `:offline`, + # `:online` or `:standard` + def detected_type + @detected_type ||= detect_medium_type + end + # Possible types for type value POSSIBLE_TYPES = [:online, :offline, :standard].freeze @@ -49,7 +60,7 @@ # registered system with Full medium should act like Online medium. # @param type [Symbol] possible values are `:online`, `:offline` and `:standard` def type=(type) - log.info "Overwritting medium to #{type}" + log.info "Overriding the medium type from #{@type.inspect} to #{type.inspect}" if !POSSIBLE_TYPES.include?(type) raise ArgumentError, "Not allowed MediumType #{type.inspect}" @@ -106,7 +117,7 @@ # Detect the medium type. # # @return [Symbol] Symbol describing the medium, one of `:offline`, - # `:online` or `:standard` + # `:online` or `:standard` def detect_medium_type url = Yast::InstURL.installInf2Url("") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.5.6/src/modules/Packages.rb new/yast2-packager-4.5.8/src/modules/Packages.rb --- old/yast2-packager-4.5.6/src/modules/Packages.rb 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/src/modules/Packages.rb 2022-11-07 11:12:39.000000000 +0100 @@ -1663,7 +1663,7 @@ return # TODO: the offline medium contains an empty repository in the root, # that should be removed in the future, remove this workaround as well - elsif Y2Packager::MediumType.offline? && product_dir == "/" + elsif Y2Packager::MediumType.detected_type == :offline && product_dir == "/" log.info "Ignoring the root repository on the offline medium" return end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.5.6/test/addon_product_test.rb new/yast2-packager-4.5.8/test/addon_product_test.rb --- old/yast2-packager-4.5.6/test/addon_product_test.rb 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/test/addon_product_test.rb 2022-11-07 11:12:39.000000000 +0100 @@ -660,15 +660,17 @@ end it "returns the new repository id" do + options = { "enabled" => true, "base_urls" => [url], "prod_dir" => pth, "priority" => prio } expect(Yast::Pkg).to receive(:RepositoryAdd) - .with("enabled" => true, "base_urls" => [url], "prod_dir" => pth, "priority" => prio) + .with(options) .and_return(repo_id) expect(subject.AddRepo(url, pth, prio)).to eq(repo_id) end it "sets priority if it is greater than -1" do + options = { "enabled" => true, "base_urls" => [url], "prod_dir" => pth } expect(Yast::Pkg).to receive(:RepositoryAdd) - .with("enabled" => true, "base_urls" => [url], "prod_dir" => pth) + .with(options) .and_return(repo_id) expect(subject.AddRepo(url, pth, -2)).to eq(repo_id) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-packager-4.5.6/test/medium_type_test.rb new/yast2-packager-4.5.8/test/medium_type_test.rb --- old/yast2-packager-4.5.6/test/medium_type_test.rb 2022-10-27 10:54:44.000000000 +0200 +++ new/yast2-packager-4.5.8/test/medium_type_test.rb 2022-11-07 11:12:39.000000000 +0100 @@ -11,6 +11,7 @@ after do # the computed value is cached, we need to reset it manually for the next test described_class.instance_variable_set(:@type, nil) + described_class.instance_variable_set(:@detected_type, nil) end describe "#type" do