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

Thanks to Martin Pitt.

diff --git a/debian/changelog b/debian/changelog
index b7515595c429da954eafc0493a24bf06495f5254..805c634e328a1b900d6153878a07fe443836b1ea 100644 (file)
--- 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 e6e81f12425eeb8d3f1aa953b3ada1c5fdce58a3..f7fff92337c78711210715ced782ab5fc19c6054 100755 (executable)
--- 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):