Merge 5a49803 into d35a4b4

yast · Dec 14, 2020 · 5e70758 · 5e70758
2 parents d35a4b4 + 5a49803
commit 5e70758
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/library/packages/src/lib/y2packager/resolvable.rb b/library/packages/src/lib/y2packager/resolvable.rb
@@ -149,7 +149,10 @@ def load_attribute(attr)
       resolvables = Yast::Pkg.Resolvables(attrs, [attr])
 
       # Finding more than one result is suspicious, log a warning
-      log.warn("Found several resolvables: #{resolvables.inspect}") if resolvables.size > 1
+      if resolvables.size > 1
+        log.warn("Found several resolvables: #{resolvables.inspect}")
+        log.warn("Resolvable details: #{Yast::Pkg.ResolvableProperties(@name, @kind, "").inspect}")
+      end
 
       resolvable = resolvables.first
       return unless resolvable&.key?(attr.to_s)

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Dec 14 13:42:24 UTC 2020 - Ladislav Slezák <lslezak@suse.cz>
+
+- Log more details when several resolvables (instead of a single
+  one) are unexpectedely found (related to bsc#1176276)
+- 4.2.88
+
 -------------------------------------------------------------------
 Fri Jul 24 08:06:27 UTC 2020 - Jeff Kowalczyk <jkowalczyk@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        4.2.87
+Version:        4.2.88
 Release:        0
 Summary:        YaST2 Main Package
 License:        GPL-2.0-only