Merge lp:~sam-sgrs/software-properties/software-properties-fix-879943 into lp:software-properties

[Sam Segers]

SoftwarePropertiesGtk launches the DBus backend. This backend keeps running between consecutive launches of the software properties.
The backend keeps the software lists in memory and only applies changes it gets from the GUI, so every change you make to the files in /etc/apt when the service is running are lost after you make a change in the GUI. It's even more confusing as the GUI does list the changes you made when you restart it, but the backend doesn't.

I've added a new dbus method to the backed that does a reload. It is triggered when the GUI launches.

I've pulled this change in the vivid package to test it locally.

[Mathieu Trudel-Lapierre (cyphermox)]

Looks good, approving.

review: Approve

=== modified file 'softwareproperties/dbus/SoftwarePropertiesDBus.py'
--- softwareproperties/dbus/SoftwarePropertiesDBus.py	2013-09-18 17:55:08 +0000
+++ softwareproperties/dbus/SoftwarePropertiesDBus.py	2015-11-01 12:52:55 +0000
@@ -105,6 +105,12 @@
             sender, conn, "com.ubuntu.softwareproperties.applychanges")
         self.revert()
 
+    @dbus.service.method(DBUS_INTERFACE_NAME,
+                         sender_keyword="sender", connection_keyword="conn",
+                         in_signature='', out_signature='')
+    def Reload(self, sender=None, conn=None):
+        self.reload_sourceslist()
+
     # Enabler/Disablers
     @dbus.service.method(DBUS_INTERFACE_NAME,
                          sender_keyword="sender", connection_keyword="conn",

=== modified file 'softwareproperties/gtk/SoftwarePropertiesGtk.py'
--- softwareproperties/gtk/SoftwarePropertiesGtk.py	2015-10-23 18:02:10 +0000
+++ softwareproperties/gtk/SoftwarePropertiesGtk.py	2015-11-01 12:52:55 +0000
@@ -151,6 +151,9 @@
         self.backend.connect_to_signal(
             "CdromScanFailed", self.on_cdrom_scan_failed)
 
+        # Reload dbus backend, for if there are any sources changed.
+        self.backend.Reload();
+
         # Show what we have early
         self.window_main.show()