From 51fe0a4db809b022d17836ac5fa5008ef6dbd813 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Thu, 30 Dec 2010 17:13:58 +0200 Subject: [PATCH] * pull-lp-source: - Support -d (LP: #681699) - str() exceptions before passing to Logger (LP: #695523) --- debian/changelog | 6 ++++-- pull-lp-source | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fcdc87..8ed754c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,7 +27,9 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low * edit-patch: Don't let cat error through if debian/source/format doesn't exist. * pull-debian-debdiff: Rewrite in Python, and use snapshot.debian.org. - * pull-lp-source: Support -d (LP: #681699) + * pull-lp-source: + - Support -d (LP: #681699) + - str() exceptions before passing to Logger (LP: #695523) * suspicious-source: Whitelist Python source code. [ Michael Bienia ] @@ -52,7 +54,7 @@ ubuntu-dev-tools (0.109) UNRELEASED; urgency=low * add "add-patch" that provides the non-interactive version of edit-patch - -- Benjamin Drung Mon, 27 Dec 2010 22:38:34 +0100 + -- Stefano Rivera Thu, 30 Dec 2010 17:13:05 +0200 ubuntu-dev-tools (0.108) experimental; urgency=low diff --git a/pull-lp-source b/pull-lp-source index af351ae..3645472 100755 --- a/pull-lp-source +++ b/pull-lp-source @@ -71,16 +71,16 @@ def main(): try: (release, pocket) = split_release_pocket(release) - except PocketDoesNotExistError, error: - Logger.error(error) + except PocketDoesNotExistError, e: + Logger.error(str(e)) sys.exit(1) try: spph = Distribution('ubuntu').getArchive().getSourcePackage(package, release, pocket) - except (SeriesNotFoundException, PackageNotFoundException), error: - Logger.error(error) + except (SeriesNotFoundException, PackageNotFoundException), e: + Logger.error(str(e)) sys.exit(1) srcpkg = UbuntuSourcePackage(package, spph.getVersion(),