From 6dc901930ab43f01860ade5b36314fc9adfd5e11 Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Wed, 21 Feb 2024 11:57:30 +0100 Subject: [PATCH 1/3] journalctl --dmesg not needed anymore --- scripts/save_y2logs | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/save_y2logs b/scripts/save_y2logs index 59ab12769..4d66476e9 100755 --- 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 From 15d96e2b66fbacbcd4367e1ae877d9002f1ef75f Mon Sep 17 00:00:00 2001 From: Michal Filka Date: Wed, 21 Feb 2024 12:08:09 +0100 Subject: [PATCH 2/3] Updated changelog --- package/yast2.changes | 6 ++++++ package/yast2.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package/yast2.changes b/package/yast2.changes index 67a1cf62a..1d2c47bb8 100644 --- a/package/yast2.changes +++ b/package/yast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 21 11:07:25 UTC 2024 - Michal Filka + +- removed "journalctl --dmesg" from save_y2los +- 4.6.7 + ------------------------------------------------------------------- Wed Feb 21 10:22:26 UTC 2024 - Michal Filka diff --git a/package/yast2.spec b/package/yast2.spec index df36c8561..58da23c3a 100644 --- a/package/yast2.spec +++ b/package/yast2.spec @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.6.6 +Version: 4.6.7 Release: 0 Summary: YaST2 Main Package From 202a352814be05196ae070a21a188ef075feea95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Tue, 7 May 2024 10:43:07 +0200 Subject: [PATCH 3/3] Properly close popups for nested progress callbacks (bsc#1223281) --- library/packages/src/modules/PackageCallbacks.rb | 2 +- package/yast2.changes | 6 ++++++ package/yast2.spec | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/library/packages/src/modules/PackageCallbacks.rb b/library/packages/src/modules/PackageCallbacks.rb index 28e843703..51e874a4c 100644 --- 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 index 1d2c47bb8..f39505275 100644 --- a/package/yast2.changes +++ b/package/yast2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon May 6 13:08:32 UTC 2024 - Ladislav Slezák + +- Properly close nested progress callbacks (bsc#1223281) +- 4.6.8 + ------------------------------------------------------------------- Wed Feb 21 11:07:25 UTC 2024 - Michal Filka diff --git a/package/yast2.spec b/package/yast2.spec index 58da23c3a..dd0b19c19 100644 --- a/package/yast2.spec +++ b/package/yast2.spec @@ -17,7 +17,7 @@ Name: yast2 -Version: 4.6.7 +Version: 4.6.8 Release: 0 Summary: YaST2 Main Package