adt-run: fix @ dependencies (#667022)

Thanks to Colin Watson.

diff --git a/debian/changelog b/debian/changelog
index 57479e5109fb63c1e1d866961ece4949b17a457c..b7515595c429da954eafc0493a24bf06495f5254 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
 autopkgtest (2.0.2) unstable; urgency=low
 
   Bugfixes:
-  * Remove our strange apt config on exit
+  * Remove our strange apt config on exit.
     Partial fix to #648142, from Timo Lindfors.
-  * Suppress apt-listbugs and apt-listchanges.  Fix from Michael Prokop.
+  * Suppress apt-listbugs and apt-listchanges.  Michael Prokop.
+  * Fix parsing of "@" dependencies.  Colin Watson.  Closes: #667022.
 
   Packaging fixes:
   * Add Recommends against pbuilder, whose dependency resolver adt-run

diff --git a/runner/adt-run b/runner/adt-run
index 310c39ae8f9aea32abd191c247c602873b874240..e6e81f12425eeb8d3f1aa953b3ada1c5fdce58a3 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1126,9 +1126,9 @@ class Test:
                        dn.append(d)
                else:
                        for (pkg,bin) in t.act.binaries:
-                               d = d.replace('@',pkg)
-                               t._debug('  synthesised dependency '+d)
-                               dn.append(d)
+                               dp = d.replace('@',pkg)
+                               t._debug('  synthesised dependency '+dp)
+                               dn.append(dp)
        testbed.prepare(dn)
  def run(t, tree):
        t._debug('[----------------------------------------')