Software Properties

Merge ~albertomilone/software-properties:ubuntu/master into software-properties:ubuntu/master

  1. Git
  2. lp:~albertomilone/software-properties
  3. ubuntu/master
  4. Merge into ubuntu/master
Proposed by Alberto Milone
Status: Merged
Merged at revision: cd4689c87c59c690859c458da07ad57a55f1d669
Proposed branch: ~albertomilone/software-properties:ubuntu/master
Merge into: software-properties:ubuntu/master
Diff against target: 13 lines (+1/-1)
1 file modified
softwareproperties/gtk/SoftwarePropertiesGtk.py (+1/-1)
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Review via email: mp+420027@code.launchpad.net

Commit message

Don't crash if the driver package does not have a matching modules package

Fixes LP: #1969460

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
2index 7bcd4b7..dc2a7ff 100644
3--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
4+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
5@@ -1422,7 +1422,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
6 modules_package_obj = self.apt_cache[modules_package]
7 if modules_package and not modules_package_obj.current_ver:
8 self.driver_changes.append(modules_package_obj)
9- except KeyError:
10+ except (KeyError, TypeError):
11 pass
12
13 if button.get_active():

Subscribers

People subscribed via source and target branches