Merge lp:~mvo/aptdaemon/fix-high-trust-repo-pkcompat into lp:aptdaemon

[Michael Vogt]

This makes the high-trust repo code work for the pkcompat layer. I would appreciate the review from Sebastian to ensure that the _simulate() does not have any unwanted side-effects.

[Robert Carr (robertcarr)]

Is this going to land?

[Michael Vogt (mvo)]

This is in as distro patch now. But we are waiting for the distro review.

[Sebastian Heinlein (glatzor)]

I don't expect any side effects by the solution that mvo suggested. But the root of the problem is deeper in the code and should be addressed after release.

Unmerged revisions

863. By Michael Vogt on 2012-10-02

fix high-trust support for pkcompat

=== modified file 'aptdaemon/pkcompat.py'
--- aptdaemon/pkcompat.py	2012-08-23 12:41:59 +0000
+++ aptdaemon/pkcompat.py	2012-10-02 13:14:22 +0000
@@ -1218,6 +1218,7 @@
         yield self.trans._set_property(APTDAEMON_TRANSACTION_DBUS_INTERFACE,
                                        "AllowUnauthenticated", not only_trusted,
                                        sender)
+        yield self.trans._simulate(sender)
         yield self.trans._run(sender)
 
     # pylint: disable-msg=C0103,C0322

=== modified file 'aptdaemon/worker.py'
--- aptdaemon/worker.py	2012-09-13 07:12:41 +0000
+++ aptdaemon/worker.py	2012-10-02 13:14:22 +0000
@@ -100,8 +100,10 @@
     # paranoia(2): we must want to install something
     if not trans.packages[PKGS_INSTALL]:
         return False
+    # we only care about the name, not the version
+    pkgs = [pkg.split("=")[0] for pkg in trans.packages[PKGS_INSTALL]]
     # if the install packages matches the whitelisted set we are good
-    return set(trans.packages[PKGS_INSTALL]) == set(trans.high_trust_packages)
+    return set(pkgs) == set(trans.high_trust_packages)
 
 
 def read_high_trust_repository_dir(whitelist_cfg_d):