Merge pull request #1311 from yast/close_progress_popups_master

yast · May 9, 2024 · b49143a · b49143a
2 parents 8f60c6c + 415230c
commit b49143a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/library/packages/src/modules/PackageCallbacks.rb b/library/packages/src/modules/PackageCallbacks.rb
@@ -2397,7 +2397,7 @@ def ProgressEnd(id)
       )
 
       if !Mode.commandline && IsProgressPopup()
-        UI.CloseDialog if Builtins.size(@progress_stack) == 0
+        UI.CloseDialog if Builtins.size(@progress_stack) >= 0
       elsif full_screen
         if Ops.greater_than(Builtins.size(@progress_stack), 0)
           progress_type = Ops.get_symbol(

diff --git a/package/yast2.changes b/package/yast2.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Mon May  6 13:08:32 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Properly close nested progress callbacks (bsc#1223281)
+- 5.0.8
+
+-------------------------------------------------------------------
+Wed Feb 21 11:07:25 UTC 2024 - Michal Filka <mfilka@suse.com>
+
+- removed "journalctl --dmesg" from save_y2los
+
 -------------------------------------------------------------------
 Wed Feb 21 10:22:26 UTC 2024 - Michal Filka <mfilka@suse.com>
 

diff --git a/package/yast2.spec b/package/yast2.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        5.0.7
+Version:        5.0.8
 
 Release:        0
 Summary:        YaST2 Main Package

diff --git a/scripts/save_y2logs b/scripts/save_y2logs
@@ -81,9 +81,7 @@ if [ "$(type -p dmesg)" ]; then
 fi
 
 if [ "$(type -p journalctl)" ]; then
-  journalctl --dmesg > $TMPDIR/journalctl-dmesg
   journalctl -b > $TMPDIR/journalctl-b
-  LIST_TMP="$LIST_TMP journalctl-dmesg"
   LIST_TMP="$LIST_TMP journalctl-b"
 fi