Merge ff1e1a6 into b9bd181

yast · Jan 7, 2019 · 78adc41 · 78adc41
2 parents b9bd181 + ff1e1a6
commit 78adc41
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb b/library/packages/src/lib/y2packager/release_notes_fetchers/rpm.rb
@@ -89,15 +89,26 @@ def latest_version
       # @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 --git a/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb b/library/packages/test/y2packager/release_notes_fetchers/rpm_test.rb
@@ -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 --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jan  7 08:40:21 UTC 2019 - lslezak@suse.cz
+
+- Ignore the old packages when fetching the release notes
+  (bsc#1112866)
+- 4.1.48
+
 -------------------------------------------------------------------
 Thu Jan  3 12:51:47 UTC 2019 - dgonzalez@suse.com
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -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