Merge 86d24c3 into 0c29b5a

yast · Oct 29, 2019 · 55f5a25 · 55f5a25
2 parents 0c29b5a + 86d24c3
commit 55f5a25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/library/packages/src/lib/y2packager/product_reader.rb b/library/packages/src/lib/y2packager/product_reader.rb
@@ -85,6 +85,7 @@ def all_products(force_repos: false)
         return Y2Packager::ProductControlProduct.products.each_with_object([]) do |p, result|
           result << Y2Packager::Product.new(name: p.name, display_name: p.label,
               version: p.version, arch: p.arch,
+              short_name: p.name, # TODO: verify that name and shortname are same for control products
               installation_package: "Test") # just hack as we do not know current package name yet
         end
       end

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 29 07:22:13 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
+
+- fix showing release notes for online upgrade (bsc#1155134)
+- 4.2.30
+
 -------------------------------------------------------------------
 Fri Oct 25 12:57:30 UTC 2019 - Josef Reidinger <jreidinger@suse.com>
 

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