diff --git a/requestbackport b/requestbackport index 138b8a9..8f27c9a 100755 --- a/requestbackport +++ b/requestbackport @@ -16,7 +16,6 @@ from collections import defaultdict import optparse -import re import sys import apt @@ -215,7 +214,8 @@ def request_backport(package_spph, source, destinations): "", "[Scope]", "", - " * List the Ubuntu release you will backport from, and the specific package version.", + " * List the Ubuntu release you will backport from," + " and the specific package version.", "", " * List the Ubuntu release(s) you will backport to.", "", @@ -250,7 +250,7 @@ def request_backport(package_spph, source, destinations): series = distro.getSeries(dest) try: bug.addTask(target=series.getSourcePackage(name=pkgname)) - except: + except Exception: break Logger.info("Backport request filed as %s", bug.web_link) diff --git a/ubuntu-build b/ubuntu-build index 3e02141..d07a71c 100755 --- a/ubuntu-build +++ b/ubuntu-build @@ -29,7 +29,7 @@ from optparse import OptionParser from ubuntutools.lp.udtexceptions import (SeriesNotFoundException, PackageNotFoundException, PocketDoesNotExistError,) -from ubuntutools.lp.lpapicache import Distribution, PersonTeam +from ubuntutools.lp.lpapicache import Distribution, Launchpad, PersonTeam from launchpadlib.credentials import TokenAuthorizationException from ubuntutools.misc import split_release_pocket