Merge lp:~vorlon/ubuntu/quantal/aptdaemon/apt-key-apt-config into lp:~vorlon/ubuntu/quantal/aptdaemon/py3

[Steve Langasek]

Simple enough change, but I'm confused as to how this issue ever made it
in in the first place given that it causes a hard testsuite failure. Am
I missing something?

[Adam Conrad (adconrad)]

Seems perfectly reasonable, especially given that in the remove method, there's an "apt_pkg.config.clear("Dir")", but there was no matching attempt to set Dir anywhere. Seems like it was probably just omitted accidentally.

review: Approve

[Sebastian Heinlein (glatzor)]

You are right, steve. We set apt_pkg.config["dir"] in the test_pk but i haven't made a complete run of the test suite. Thanks.
--
Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet.

Adam Conrad <[e-mail]> schrieb:

Review: Approve

Seems perfectly reasonable, especially given that in the remove method, there's an "apt_pkg.config.clear("Dir")", but there was no matching attempt to set Dir anywhere. Seems like it was probably just omitted accidentally.
--
https://code.launchpad.net/~vorlon/ubuntu/quantal/aptdaemon/apt-key-apt-config/+merge/109919
You are requested to review the proposed merge of lp:~vorlon/ubuntu/quantal/aptdaemon/apt-key-apt-config into lp:~vorlon/ubuntu/quantal/aptdaemon/py3.

=== modified file 'aptdaemon/test.py'
--- aptdaemon/test.py	2012-06-12 19:03:12 +0000
+++ aptdaemon/test.py	2012-06-12 20:13:20 +0000
@@ -79,6 +79,7 @@
             cnf.write("Dir::Bin::Apt-Key %s;" % apt_key_wrapper)
         apt_pkg.read_config_file(apt_pkg.config, config_path)
         apt_pkg.init_system()
+        apt_pkg.config["Dir"] = self.path
 
     def remove(self):
         """Remove the files of the chroot."""

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-12 19:03:12 +0000
+++ debian/changelog	2012-06-12 20:13:20 +0000
@@ -27,6 +27,9 @@
   * debian/control:
     - Remove python-software-properties dependency in favor of new
       python-apt with apt.auth module
+  * aptdaemon/test.py: explicitly set the chroot directory in the apt config
+    as part of the test setup, without which apt-key's chroot handling won't
+    work.
 
  -- Sebastian Heinlein <[e-mail]>  Fri, 11 May 2012 08:39:34 -0700