From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Jun 2012 23:29:26 +0000 (+0100)
Subject: adt-run: fix @ dependencies (#667022)
X-Git-Tag: debian/2.1.0~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2e72618cc781b4032504690c9e810def721c321a;p=autopkgtest.git

adt-run: fix @ dependencies (#667022)

Thanks to Colin Watson.
---

diff --git a/debian/changelog b/debian/changelog
index 57479e5..b751559 100644
--- 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 310c39a..e6e81f1 100755
--- 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('[----------------------------------------')