From 314803e0c48147bd0b90cc2d90f77d0a6b03b1cc Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 30 Jul 2011 17:36:21 +0100 Subject: [PATCH] adt-run: remove python string exceptions --- debian/changelog | 3 ++- runner/adt-run | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 24e3e5c..3021d2f 100644 --- 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. - * Many bugfixes. + * Many bugfixes, including: + - replace Python string exceptions (closes:#585226). -- Ian Jackson Sat, 30 Jul 2011 15:44:15 +0100 diff --git a/runner/adt-run b/runner/adt-run index 2804cf5..f935f3f 100755 --- 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)) - 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: @@ -644,7 +644,7 @@ def parse_args(): 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 -- 2.30.2