Skip to content

Prevent Crash if Closing the DASD Context Menu without Action [master] #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shundhammer merged 4 commits into from
May 10, 2023
Merged

Prevent Crash if Closing the DASD Context Menu without Action [master] #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca10f0e
Ignore closing the context menu (bsc#1211213)
shundhammer May 10, 2023
3aa139e
Version bump and change log
shundhammer May 10, 2023
d4f39d7
Merge pull request #103 from yast/huha-fix-context-menu
shundhammer May 10, 2023
12d16c7
Merge remote-tracking branch 'upstream/SLE-15-SP5' into huha-fix-cont…
shundhammer May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions package/yast2-s390.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed May 10 13:35:34 UTC 2023 - Stefan Hundhammer <shundhammer@suse.com>

- Prevent crash when the user closes the DASD context menu
without action (bsc#1211213)
- Graceful handling of missing actions in the DASD context menu:
just log an error, don't crash
- 4.6.1

-------------------------------------------------------------------
Fri Mar 03 14:44:07 UTC 2023 - Ladislav Slezák <lslezak@suse.cz>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-s390.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-s390
Version: 4.6.0
Version: 4.6.1
Release: 0
Group: System/YaST
License: GPL-2.0-only
Expand Down
9 changes: 8 additions & 1 deletion src/include/s390/dasd/dialogs.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,14 @@ def action_class_for(action)
# @param action [Y2S390::DasdAction] the action to perform
# @param selected [Y2S390::DasdsCollection] the collection of DASD devices to work with
def run(action, selected)
Object.const_get(action_class_for(action)).run(selected)
return false if action == :cancel # Ignore closing the context menu (bsc#1211213)

begin
Object.const_get(action_class_for(action)).run(selected)
rescue NameError => e
log.error("No action for #{action}: #{e}")
return false
end
end

def PerformAction(action)
Expand Down