Hello community, here is the log from the commit of package yast2 for openSUSE:Factory checked in at 2019-01-10 15:15:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2 (Old) and /work/SRC/openSUSE:Factory/.yast2.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2" Thu Jan 10 15:15:59 2019 rev:440 rq:663325 version:4.1.48 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2/yast2.changes 2019-01-05 14:40:35.960569832 +0100 +++ /work/SRC/openSUSE:Factory/.yast2.new.28833/yast2.changes 2019-01-10 15:16:01.646765339 +0100 @@ -1,0 +2,7 @@ +Mon Jan 7 08:40:21 UTC 2019 - [email protected] + +- Ignore the old packages when fetching the release notes + (bsc#1112866) +- 4.1.48 + +------------------------------------------------------------------- Old: ---- yast2-4.1.47.tar.bz2 New: ---- yast2-4.1.48.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.W6RbUb/_old 2019-01-10 15:16:02.166764841 +0100 +++ /var/tmp/diff_new_pack.W6RbUb/_new 2019-01-10 15:16:02.166764841 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.47 +Version: 4.1.48 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only ++++++ yast2-4.1.47.tar.bz2 -> yast2-4.1.48.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.47/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb new/yast2-4.1.48/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb --- old/yast2-4.1.47/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb 2019-01-03 14:10:51.000000000 +0100 +++ new/yast2-4.1.48/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb 2019-01-07 11:39:08.000000000 +0100 @@ -89,15 +89,26 @@ # @return [Package,nil] Package containing the release notes; nil if not found def release_notes_package return @release_notes_package if @release_notes_package + + log.info "Searching release notes for product #{product.name}..." provides = Yast::Pkg.PkgQueryProvides("release-notes()") release_notes_packages = provides.map(&:first).uniq package_name = release_notes_packages.sort.find do |name| - dependencies = Yast::Pkg.ResolvableDependencies(name, :package, "").first["deps"] + package_list = Yast::Pkg.ResolvableDependencies(name, :package, "") + + log.debug "Evaluating #{name} provides: #{package_list}" + package = package_list.find { |p| p["status"] == :selected } || package_list.find { |p| p["status"] == :available } + log.debug "Checking package #{package}" + next false unless package + + dependencies = package["deps"] dependencies.any? do |dep| # mind $ at the end of the regexp, otherwise for SLES you may get RNs of any SLES.* product - dep["provides"].to_s.match(/release-notes\(\)\s*=\s*#{product.name}\s*$/) + dep["provides"].to_s.match(/^\s*release-notes\(\)\s*=\s*#{Regexp.escape(product.name)}\s*$/) end end + + log.info "Found release package: #{package_name}" return nil if package_name.nil? @release_notes_package = find_package(package_name) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.47/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb new/yast2-4.1.48/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb --- old/yast2-4.1.47/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb 2019-01-03 14:10:51.000000000 +0100 +++ new/yast2-4.1.48/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb 2019-01-07 11:39:08.000000000 +0100 @@ -11,7 +11,10 @@ let(:package) { Y2Packager::Package.new("release-notes-dummy", 2, "15.1") } let(:dependencies) do [ - { "deps" => [{ "provides" => "release-notes() = dummy" }] } + { + "status" => :selected, + "deps" => [{ "provides" => "release-notes() = dummy" }] + } ] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.47/package/yast2.changes new/yast2-4.1.48/package/yast2.changes --- old/yast2-4.1.47/package/yast2.changes 2019-01-03 14:10:51.000000000 +0100 +++ new/yast2-4.1.48/package/yast2.changes 2019-01-07 11:39:08.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Jan 7 08:40:21 UTC 2019 - [email protected] + +- Ignore the old packages when fetching the release notes + (bsc#1112866) +- 4.1.48 + +------------------------------------------------------------------- Thu Jan 3 12:51:47 UTC 2019 - [email protected] - Fix a fragile unit test (related to changes introduced diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-4.1.47/package/yast2.spec new/yast2-4.1.48/package/yast2.spec --- old/yast2-4.1.47/package/yast2.spec 2019-01-03 14:10:51.000000000 +0100 +++ new/yast2-4.1.48/package/yast2.spec 2019-01-07 11:39:08.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.1.47 +Version: 4.1.48 Release: 0 Summary: YaST2 - Main Package License: GPL-2.0-only
