Merge remote-tracking branch 'origin/SLE-15-SP3' into release_notes_f…

…ix_master
yast · Sep 9, 2021 · e6f40d0 · e6f40d0
2 parents b02bbac + 238328d
commit e6f40d0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Sep  9 15:54:57 UTC 2021 - Ladislav Slezák <lslezak@suse.cz>
+
+- Display release notes during upgrade (bsc#1186044)
+- 4.4.18
+
 -------------------------------------------------------------------
 Tue Aug 24 14:58:48 UTC 2021 - Stefan Hundhammer <shundhammer@suse.com>
 

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.4.17
+Version:        4.4.18
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

diff --git a/src/lib/installation/clients/inst_download_release_notes.rb b/src/lib/installation/clients/inst_download_release_notes.rb
@@ -77,7 +77,8 @@ def init_ui
     def main
       textdomain "installation"
 
-      return :auto unless Packages.init_called
+      # Packages.Init is not called during upgrade
+      return :auto if !Packages.init_called && !Stage.initial && !Mode.update
 
       return :back if GetInstArgs.going_back
 

diff --git a/test/lib/clients/inst_download_release_notes_test.rb b/test/lib/clients/inst_download_release_notes_test.rb
@@ -39,6 +39,7 @@
       allow(sles).to receive(:status?).with(:available).and_return(false)
       allow(sdk).to receive(:status?).with(:available).and_return(!sdk_selected)
       allow(Yast::Stage).to receive(:initial).and_return(true)
+      allow(Yast::Mode).to receive(:update).and_return(false)
       allow(Yast::Packages).to receive(:init_called).and_return(packages_init_called)
       stub_const("Yast::Language", language)