Merge lp:~mvo/aptdaemon/enable-component into lp:aptdaemon

[Michael Vogt]

add a enable_component() functionality for apturl and software-properties

[lp:~mvo/aptdaemon/enable-component]

339. By Michael Vogt on 2010-03-30

rename to EnableDistroComponent

[Sebastian Heinlein (glatzor)]

Merged some time ago

review: Approve

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2010-03-17 05:29:47 +0000
+++ aptdaemon/client.py	2010-03-30 07:39:29 +0000
@@ -585,6 +585,18 @@
         return self._run_transaction("InstallPackages", [package_names],
                                      wait, reply_handler, error_handler)
 
+    def enable_distro_component(self, component,
+                                reply_handler=None, error_handler=None):
+        """Add component to the sources list.
+
+        Keyword arguments:
+        component -- a components e.g. main or universe
+        """
+        daemon = get_aptdaemon()
+        return daemon.EnableDistroComponent(component, 
+                                            reply_handler=reply_handler,
+                                            error_handler=error_handler)
+
     def add_repository(self, src_type, uri, dist, comps=[], comment="", 
                        sourcesfile="", reply_handler=None, error_handler=None):
         """Add repository to the sources list.
 
=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2010-02-10 10:48:21 +0000
+++ aptdaemon/core.py	2010-03-30 07:39:29 +0000
@@ -52,6 +52,8 @@
 from softwareproperties.AptAuth import AptAuth
 from aptsources.sourceslist import SourcesList
 import apt_pkg
+import aptsources
+import aptsources.distro
 
 import errors
 from enums import *
@@ -1167,6 +1169,33 @@
                                                              sourcesfile))
         return deferred
 
+    def _enable_component(self, component):
+        """Helper for the enable-component function"""
+        old_umask = os.umask(0022)
+        sourceslist = SourcesList()
+        distro = aptsources.distro.get_distro()
+        distro.get_sources(sourceslist)
+        distro.enable_component(component)
+        sourceslist.save()
+        os.umask(old_umask)
+        return True
+
+    @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
+                          in_signature="s", out_signature="b",
+                          sender_keyword="sender")
+    def EnableDistroComponent(self, component, sender):
+        """Enable given component in the sources list.
+
+        Keyword arguments:
+        component -- a components, e.g. main or universe
+        sender -- the unique D-Bus name of the sender (provided by D-Bus)
+        """
+        log.info("EnableComponent() was called: component='%s' ", component)
+        action = policykit1.PK_ACTION_CHANGE_REPOSITORY
+        deferred = policykit1.check_authorization_by_name(sender, action)
+        deferred.add_callback(lambda x: self._enable_component(component))
+        return deferred
+
     @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
                           in_signature="", out_signature="as",
                           sender_keyword="sender")