Merge lp:~brian-murray/software-properties/bug-1506169 into lp:software-properties

[Brian Murray]

This will fix an issue where linux-generic is getting uninstalled if it is already installed when one switches to a proprietary driver that requires dkms.

[Michael Vogt (mvo)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-13 18:31:21 +0000
+++ debian/changelog	2015-10-23 18:04:17 +0000
@@ -1,3 +1,10 @@
+software-properties (0.96.14) UNRELEASED; urgency=medium
+
+  * If a driver package depends on dkms and the correct linux meta package is
+    already installed don't uninstall it. (LP: #1506169)
+
+ -- Brian Murray <[e-mail]>  Fri, 23 Oct 2015 10:58:33 -0700
+
 software-properties (0.96.13) wily; urgency=medium
 
   * Properly parse a ppa which has a leading slash, something which a lot of

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2014-12-01 07:05:24 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2015-10-23 18:04:17 +0000
@@ -1176,7 +1176,9 @@
                     if (linux_meta and
                         linux_meta not in self.driver_changes):
                         # Install the linux metapackage
-                        self.driver_changes.append(self.apt_cache[linux_meta])
+                        lmp = self.apt_cache[linux_meta]
+                        if not lmp.is_installed:
+                            self.driver_changes.append(lmp)
         except KeyError:
             pass