adt-run: remove python string exceptions

diff --git a/debian/changelog b/debian/changelog
index 24e3e5c61d9ceb7f0e3db05e4e2e66b8d118e6a3..3021d2ff39c030756c082f108ac127c6358be331 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,7 +11,8 @@ autopkgtest (2.0.0~~0) unstable; urgency=low
   * Remove dependency on python in testbed.
   * Update python version to 2.6.
   * Spec wording improvements, clarifications, editorial changes, etc.
   * Remove dependency on python in testbed.
   * Update python version to 2.6.
   * Spec wording improvements, clarifications, editorial changes, etc.

-  * Many bugfixes.
+  * Many bugfixes, including:
+    - replace Python string exceptions (closes:#585226).

 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jul 2011 15:44:15 +0100
 
 
  -- Ian Jackson <ijackson@chiark.greenend.org.uk>  Sat, 30 Jul 2011 15:44:15 +0100
 

diff --git a/runner/adt-run b/runner/adt-run
index 2804cf56f8c7966682be39eea627c6637306aedf..f935f3fe1ed86658ae9418d6f860043259292d28 100755 (executable)
--- a/runner/adt-run
+++ b/runner/adt-run
@@ -261,7 +261,7 @@ class AutoFile:
        xtra = ''
        if p.spec is not None:
                xtra = ' spec[%s]=%s' % (p.spec, getattr(p,'spec_tb',None))
        xtra = ''
        if p.spec is not None:
                xtra = ' spec[%s]=%s' % (p.spec, getattr(p,'spec_tb',None))

-       raise ("internal error: %s (%s)" % (how, str(p)))
+       raise Exception("internal error: %s (%s)" % (how, str(p)))

 
  def _ensure_path(p, tbp):
        if p.path[tbp] is None:
 
  def _ensure_path(p, tbp):
        if p.path[tbp] is None:


@@ -644,7 +644,7 @@ def parse_args():
                elif type(act) == str:
                        act = (act,act)
                else:
                elif type(act) == str:
                        act = (act,act)
                else:

-                       raise ("unknown action in list `%s' having"
+                       raise Exception("unknown action in list `%s' having"

                              " type `%s'" % (act, type(act)))
                (pathstr, kindpath) = act
 
                              " type `%s'" % (act, type(act)))
                (pathstr, kindpath) = act