From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 10 Jun 2012 23:32:03 +0000 (+0100)
Subject: adt-run: Fix NameError on 'f' in restriction parsing (#647882)
X-Git-Tag: debian/2.1.0~7
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=autopkgtest.git;a=commitdiff_plain;h=013f5ecb52a3a21368a8ae57f2b0cd0d1c3efc50

adt-run: Fix NameError on 'f' in restriction parsing (#647882)

Thanks to Martin Pitt.
---

diff --git a/debian/changelog b/debian/changelog
index b751559..805c634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ autopkgtest (2.0.2) unstable; urgency=low
     Partial fix to #648142, from Timo Lindfors.
   * Suppress apt-listbugs and apt-listchanges.  Michael Prokop.
   * Fix parsing of "@" dependencies.  Colin Watson.  Closes: #667022.
+  * Fix NameError re "f" in restriction parsing.
+    Martin Pitt.  Closes: #647882.
 
   Packaging fixes:
   * Add Recommends against pbuilder, whose dependency resolver adt-run
diff --git a/runner/adt-run b/runner/adt-run
index e6e81f1..f7fff92 100755
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -1027,12 +1027,12 @@ class Restriction_build_needed(Restriction): pass
 class Restriction_breaks_testbed(Restriction):
  def __init__(r, rname, base):
 	if 'revert-full-system' not in testbed.caps:
-		raise Unsupported(f.lno,
+		raise Unsupported(-1,
 	'Test breaks testbed but testbed does not advertise revert-full-system')
 class Restriction_needs_root(Restriction):
  def __init__(r, rname, base):
 	if 'root-on-testbed' not in testbed.caps:
-		raise Unsupported(f.lno,
+		raise Unsupported(-1,
 			'Test needs root on testbed which is not available')
 
 class Field_Restrictions(FieldBase):