Merge lp:~pitti/aptdaemon/pkcompat-enhancements into lp:aptdaemon

[Martin Pitt]

Implement RepoEnable() for enable==True.

It does not yet implement removing a repository (enable==False), as that is
more tricky to do.

[Michael Vogt (mvo)]

Looks good to me, thanks pitti.

review: Approve

[Martin Pitt (pitti)]

Pushed to trunk, thanks!

=== modified file 'README.PackageKit'
--- README.PackageKit	2012-05-31 09:36:38 +0000
+++ README.PackageKit	2012-05-31 13:11:18 +0000
@@ -51,14 +51,14 @@
  - GetDistroUpgrades
  - UpgradeSystem
  - WhatProvides (no builtin handling, only plugins)
+ - RepoEnable: (only enabling, not disabling)
 
 Not yet supported roles:
 
  - GetCategories: Curently groups are still used, would be nice to reuse the
        categories from software-center
  - GetRepoList: not implemented in the worker
- - RepoEnable: not implemented in the worker)
- - RepoSetData: not implemented in the worker)
+ - RepoSetData: not implemented in the worker
  - InstallFiles: not implemented in the worker
  - SimulateInstallFiles: not implemented in the worker
        sessioninstaller.

=== modified file 'aptdaemon/pkcompat.py'
--- aptdaemon/pkcompat.py	2012-05-13 02:22:25 +0000
+++ aptdaemon/pkcompat.py	2012-05-31 13:11:18 +0000
@@ -262,6 +262,7 @@
                        pk_enums.ROLE_SEARCH_GROUP,
                        pk_enums.ROLE_SEARCH_FILE,
                        pk_enums.ROLE_WHAT_PROVIDES,
+                       pk_enums.ROLE_REPO_ENABLE,
                        pk_enums.ROLE_DOWNLOAD_PACKAGES]
     if META_RELEASE_SUPPORT:
         SUPPORTED_ROLES.append(pk_enums.ROLE_GET_DISTRO_UPGRADES)
@@ -1776,18 +1777,21 @@
         self.role = pk_enums.ROLE_REPO_SET_DATA
         GObject.idle_add(self._fail_not_implemented)
 
-    @dbus.service.method(PACKAGEKIT_TRANS_DBUS_INTERFACE,
-                         in_signature="sb", out_signature="",
-                         sender_keyword="sender")
+    @dbus_deferred_method(PACKAGEKIT_TRANS_DBUS_INTERFACE,
+                          in_signature="sb", out_signature="",
+                          sender_keyword="sender")
     def RepoEnable(self, repo_id, enabled, sender):
         """This method enables the repository specified.
 
         :param repo_id:
-            A repository identifier, e.g. fedora-development-debuginfo
+            A repository identifier, e.g. fedora-development-debuginfo or an
+            apt source ("deb http://... unstable main")
         :param enabled: true if enabled, false if disabled.
         """
         self.role = pk_enums.ROLE_REPO_ENABLE
-        GObject.idle_add(self._fail_not_implemented)
+        kwargs = {"repo_id": repo_id,
+                  "enabled": enabled}
+        return self._run_query(kwargs, sender)
 
     @dbus.service.method(PACKAGEKIT_TRANS_DBUS_INTERFACE,
                          in_signature="s", out_signature="",
@@ -1981,6 +1985,8 @@
             self.download_packages(trans, **trans.kwargs)
         elif trans.pktrans.role == pk_enums.ROLE_WHAT_PROVIDES:
             self.what_provides(trans, **trans.kwargs)
+        elif trans.pktrans.role == pk_enums.ROLE_REPO_ENABLE:
+            self.repo_enable(trans, **trans.kwargs)
         else:
             raise TransactionFailed(aptd_enums.ERROR_UNKNOWN,
                                     "Role %s isn't supported",
@@ -2556,10 +2562,7 @@
             trans.emit_files(id, files)
 
     def what_provides(self, trans, filters, type, values):
-        """Emit all dependencies of the given package ids.
-
-        Doesn't support recursive dependency resolution.
-        """
+        """Emit all packages which provide the given type and search value."""
         self._init_plugins()
 
         supported_type = False
@@ -2580,6 +2583,21 @@
             raise TransactionFailed(aptd_enums.ERROR_NOT_SUPPORTED,
                                     "Query type '%s' is not supported" % type)
 
+    def repo_enable(self, trans, repo_id, enabled):
+        """Enable or disable a repository."""
+
+        if not enabled:
+            raise TransactionFailed(aptd_enums.ERROR_NOT_SUPPORTED,
+                    "Disabling repositories is not implemented")
+
+        fields = repo_id.split()
+        if len(fields) < 3 or fields[0] not in ('deb', 'deb-src'):
+            raise TransactionFailed(aptd_enums.ERROR_NOT_SUPPORTED,
+                    "Unknown repository ID format: %s" % repo_id)
+
+        self.add_repository(trans, fields[0], fields[1], fields[2],
+                fields[3:], '', None)
+
 
     # Helpers
 

=== modified file 'tests/test_pk.py'
--- tests/test_pk.py	2012-05-12 16:04:00 +0000
+++ tests/test_pk.py	2012-05-31 13:11:18 +0000
@@ -57,7 +57,6 @@
 
     def test_install(self):
         """Test installing a package."""
-        self.chroot.add_test_repository()
         pkg_name = "silly-depend-base"
 
         client = pk.Client()
@@ -93,7 +92,6 @@
 
     def test_download(self):
         """Test downloading packages."""
-        self.chroot.add_test_repository()
         pkg_filename = "silly-base_0.1-0update1_all.deb"
         pkg_id = "silly-base;0.1-0update1;all;"
         temp_dir = tempfile.mkdtemp(prefix="aptd-download-test-")
@@ -109,7 +107,6 @@
 
     def test_get_updates(self):
         """Test getting updates."""
-        self.chroot.add_test_repository()
         pkg = "silly-base_0.1-0_all.deb"
         self.chroot.install_debfile(os.path.join(REPO_PATH, pkg), True)
 
@@ -129,7 +126,6 @@
 
     def test_get_updates_security(self):
         """Test if security updates are detected correctly."""
-        self.chroot.add_test_repository()
         self.chroot.add_repository(os.path.join(aptdaemon.test.get_tests_dir(),
                                                 "repo/security"))
         pkg = "silly-base_0.1-0_all.deb"
@@ -318,6 +314,79 @@
             self.assertTrue("plasma" in str(e), e)
             self.assertTrue("not supported" in str(e), e)
 
+    def test_repo_enable(self):
+        """Test adding a repository."""
+        client = pk.Client()
+
+        # create test update repo
+        repo = tempfile.mkdtemp()
+        self.addCleanup(shutil.rmtree, repo)
+        with open(os.path.join(repo, 'Packages'), 'w') as f:
+            f.write('''Package: silly-new
+Priority: extra
+Section: admin
+Installed-Size: 44
+Maintainer: Sebastian Heinlein <[e-mail]>
+Architecture: all
+Source: silly-new (0.1-0)
+Version: 1.2.3
+Filename: %s/silly-base_0.1-0update1_all.deb
+Size: 1934
+MD5sum: 8e20af56a63a1e0cf40db3b0d07e7989
+SHA1: 7ce87423d9c7a734478c464021994944d07fbf1b
+SHA256: d3693c0e3e7a9519b2833fdf1301c7e03e0620edf15b95b4c7329d9eb0bee553
+Description: new package from a third-party repo
+''' % self.chroot.path)
+
+        # without the new repo, we do not have it yet
+        self.assertRaises(GLib.GError, client.resolve, pk.FilterEnum.NONE,
+                ['silly-new'], None, lambda p, t, d: True, None)
+
+        # now add the new repo
+        apt_source = 'deb file://%s /' % repo
+        res = client.repo_enable(apt_source, True, None, 
+                lambda p, t, d: True, None)
+        self.assertEqual(res.get_exit_code(), pk.ExitEnum.SUCCESS)
+
+        with open(os.path.join(self.chroot.path, 'etc', 'apt', 'sources.list')) as f:
+            for line in f:
+                if line.strip() == apt_source:
+                    break
+            else:
+                self.fail('did not find newly added repository in sources.list')
+
+        # should not actually download the indexes yet
+        self.assertRaises(GLib.GError, client.resolve, pk.FilterEnum.NONE,
+                ['silly-new'], None, lambda p, t, d: True, None)
+
+        res = client.refresh_cache(False, None, lambda p, t, d: True, None)
+        self.assertEqual(res.get_exit_code(), pk.ExitEnum.SUCCESS)
+
+        # we should now see the new package
+        res = client.resolve(pk.FilterEnum.NONE, ['silly-new'], None,
+                             lambda p, t, d: True, None)
+        self.assertEqual(res.get_exit_code(), pk.ExitEnum.SUCCESS)
+        packages = res.get_package_array()
+        self.assertEqual(len(packages), 1)
+        self.assertEqual(packages[0].get_name(), "silly-new")
+        self.assertEqual(packages[0].get_version(), "1.2.3")
+        self.assertEqual(packages[0].get_info(), pk.info_enum_from_string("available"))
+
+    def test_repo_enable_errors(self):
+        """Test errors when adding a repository."""
+        client = pk.Client()
+
+        try:
+            client.repo_enable('bogus', True, None, lambda p, t, d: True, None)
+        except GLib.GError as e:
+            self.assertTrue('format' in str(e))
+            self.assertTrue('bogus' in str(e))
+
+        try:
+            client.repo_enable('deb http://example.com', True, None, lambda p, t, d: True, None)
+        except GLib.GError as e:
+            self.assertTrue('format' in str(e), e)
+            self.assertTrue('http://example.com' in str(e), e)
 
 @unittest.skipIf(sys.version_info.major < 3, "Python3 only")
 def setUp():