Merge lp:~aptdaemon-developers/aptdaemon/update-cache-partially into lp:aptdaemon/0.3

[Sebastian Heinlein]

Support updating only repositories specified in a separate sources.list snippet

=== modified file 'aptdaemon/client.py'
--- aptdaemon/client.py	2010-09-04 06:56:08 +0000
+++ aptdaemon/client.py	2010-09-09 06:27:42 +0000
@@ -907,11 +907,15 @@
 
     @defer.deferable
     @convert_dbus_exception
-    def update_cache(self, wait=False, reply_handler=None, error_handler=None):
+    def update_cache(self, sources_list=None, wait=False,
+                     reply_handler=None, error_handler=None):
         """Return a transaction which queries the software sources
         (package repositories) for available packages.
 
         Keyword arguments:
+        sources_list - Path to a sources.list which contains repositories
+            that should be updated only. The other repositories will
+            be ignored in this case.
         wait - if True run the transaction immediately and return its exit
             state instead of the transaction itself.
         reply_handler - callback function. If specified in combination with
@@ -919,8 +923,12 @@
         error_handler - in case of an error the given callback gets the
             corresponding DBus exception instance
         """
-        return self._run_transaction("UpdateCache", [], wait, reply_handler,
-                                     error_handler)
+        if sources_list:
+            return self._run_transaction("UpdateCachePartially", [sources_list],
+                                         wait, reply_handler, error_handler)
+        else:
+            return self._run_transaction("UpdateCache", [], wait, reply_handler,
+                                         error_handler)
 
     @defer.deferable
     @convert_dbus_exception
 
=== modified file 'aptdaemon/core.py'
--- aptdaemon/core.py	2010-09-09 05:54:04 +0000
+++ aptdaemon/core.py	2010-09-09 06:27:42 +0000
@@ -1126,9 +1126,31 @@
         sender -- the unique D-Bus name of the sender (provided by D-Bus)
         """
         log.info("UpdateCache() was called")
-        return self._create_trans(enums.ROLE_UPDATE_CACHE,
-                                  policykit1.PK_ACTION_UPDATE_CACHE,
-                                  sender)
+        kwargs = {"sources_list": None}
+        return self._create_trans(enums.ROLE_UPDATE_CACHE,
+                                  policykit1.PK_ACTION_UPDATE_CACHE, sender,
+                                  kwargs=kwargs)
+
+    @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
+                          in_signature="s", out_signature="s",
+                          sender_keyword="sender")
+    def UpdateCachePartially(self, sources_list, sender):
+        """Return the id of a newly create transaction which will update
+        cache from the repositories defined in the given sources.list.
+
+        Downloads the latest information about available packages from the
+        repositories.
+
+        Keyword argument:
+        sources_list -- path to a sources.list, e.g.
+            /etc/apt/sources.list.d/ppa-aptdaemon.list
+        sender -- the unique D-Bus name of the sender (provided by D-Bus)
+        """
+        log.info("UpdateCachePartially() was called")
+        kwargs = {"sources_list": sources_list}
+        return self._create_trans(enums.ROLE_UPDATE_CACHE,
+                                  policykit1.PK_ACTION_UPDATE_CACHE, sender,
+                                  kwargs=kwargs)
 
     @dbus_deferred_method(APTDAEMON_DBUS_INTERFACE,
                           in_signature="as", out_signature="s",
 
=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2010-09-04 06:56:08 +0000
+++ aptdaemon/worker.py	2010-09-09 06:27:42 +0000
@@ -159,7 +159,7 @@
             if self.trans.role == ROLE_FIX_BROKEN_DEPENDS:
                 self.fix_broken_depends()
             elif self.trans.role == ROLE_UPDATE_CACHE:
-                self.update_cache()
+                self.update_cache(**self.trans.kwargs)
             # Process the transactions which require a consistent cache
             elif self._cache and self._cache.broken_count:
                 broken = [pkg.name for pkg in self._cache if pkg.is_now_broken]
@@ -563,12 +563,12 @@
             resolver.clear(pkg)
             resolver.protect(pkg)
 
-    def update_cache(self):
+    def update_cache(self, sources_list):
         """Update the cache."""
         log.info("Updating cache")
         progress = DaemonAcquireProgress(self.trans, begin=10, end=95)
         try:
-            self._cache.update(progress)
+            self._cache.update(progress, sources_list=sources_list)
         except apt.cache.FetchFailedException, error:
             raise TransactionFailed(ERROR_REPO_DOWNLOAD_FAILED,
                                     str(error.message))
 
=== modified file 'doc/org.debian.apt.7'
--- doc/org.debian.apt.7	2010-07-14 07:16:44 +0000
+++ doc/org.debian.apt.7	2010-09-09 06:27:42 +0000
@@ -70,6 +70,15 @@
 Return the id of a newly created transaction which will fetch the latest meta data from the repositories an rebuild the cache of available and installed packages.
 .RE
 .TP
+.B UpdateCachePartially
+.BI "UpdateCachePartially\t(in 's' " sources_list , 
+.br
+.BI "\t\tout 's' " tid )
+.RS
+.PP
+Return the id of a newly created transaction which will fetch the latest meta data from the repositories specified in the given sources.list snippet only and rebuild the cache of available and installed packages.
+.RE
+.TP
 .B InstallPackages
 .BI "InstallPackages\t(in 'as' " package_names ,
 .br