Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-05-09 16:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix all flake8 issues

Browse Source
This commit is contained in:
Benjamin Drung 2017-05-01 00:20:03 +02:00
parent 3a6cd3ac66
commit cc7170eccb
49 changed files with 476 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
404main
View File

@ -31,11 +31,12 @@ import apt
from ubuntutools import subprocess from ubuntutools import subprocess
def process_deps(cache, deps): def process_deps(cache, deps):
"""Takes a list of (build) dependencies and processes it.""" """Takes a list of (build) dependencies and processes it."""
for basedep in [d.or_dependencies[0] for d in deps]: for basedep in [d.or_dependencies[0] for d in deps]:
if not packages.has_key(basedep.name) and basedep.name != '': if basedep.name not in packages and basedep.name != '':
# Check the (build) dependencies recursively # Check the (build) dependencies recursively
find_main(cache, basedep.name) find_main(cache, basedep.name)
@ -79,7 +80,7 @@ def find_main(cache, pack):
packages[pack] = True packages[pack] = True
return return
else: else:
if not packages.has_key(pack): if pack not in packages:
packages[pack] = False packages[pack] = False
# Retrieve package dependencies # Retrieve package dependencies
@ -108,10 +109,12 @@ def find_main(cache, pack):
process_deps(cache, deps) process_deps(cache, deps)
def usage(exit_code): def usage(exit_code):
print 'Usage: %s <package name> [<distribution>]' % sys.argv[0] print 'Usage: %s <package name> [<distribution>]' % sys.argv[0]
sys.exit(exit_code) sys.exit(exit_code)
def main(): def main():
global packages, distro global packages, distro
@ -129,9 +132,8 @@ def main():
distro = sys.argv[2] distro = sys.argv[2]
if not get_package_version(cache, distro, 'bash'): if not get_package_version(cache, distro, 'bash'):
print u'«%s» is not a valid distribution.' % distro print u'«%s» is not a valid distribution.' % distro
print ('Remember that for 404main to work with a certain ' print('Remember that for 404main to work with a certain distribution '
'distribution it must be in your /etc/apt/sources.list ' 'it must be in your /etc/apt/sources.list file.')
'file.')
sys.exit(1) sys.exit(1)
else: else:
cmd = ['lsb_release', '-cs'] cmd = ['lsb_release', '-cs']
@ -139,12 +141,10 @@ def main():
distro = process.stdout.read().strip('\n') distro = process.stdout.read().strip('\n')
if not get_package_version(cache, distro, sys.argv[1]): if not get_package_version(cache, distro, sys.argv[1]):
print (u"Can't find package «%s» in distribution «%s»." print(u"Can't find package «%s» in distribution «%s»." % (sys.argv[1], distro))
% (sys.argv[1], distro))
sys.exit(1) sys.exit(1)
print (u'Checking package «%s» in distribution «%s»...' print(u'Checking package «%s» in distribution «%s»...' % (sys.argv[1], distro))
% (sys.argv[1], distro))
find_main(cache, sys.argv[1]) find_main(cache, sys.argv[1])
@ -159,8 +159,9 @@ def main():
print ' ', package print ' ', package
if all_in_main: if all_in_main:
print (u'Package «%s» and all its dependencies and build dependencies ' print((u'Package «%s» and all its dependencies and build dependencies are in main.') %
u'are in main.') % sys.argv[1] sys.argv[1])
if __name__ == '__main__': if __name__ == '__main__':

23
backportpackage
View File

@ -41,10 +41,12 @@ from ubuntutools.misc import (system_distribution, vendor_to_distroinfo,
from ubuntutools.question import YesNoQuestion from ubuntutools.question import YesNoQuestion
from ubuntutools import subprocess from ubuntutools import subprocess
def error(msg): def error(msg):
Logger.error(msg) Logger.error(msg)
sys.exit(1) sys.exit(1)
def check_call(cmd, *args, **kwargs): def check_call(cmd, *args, **kwargs):
Logger.command(cmd) Logger.command(cmd)
ret = subprocess.call(cmd, *args, **kwargs) ret = subprocess.call(cmd, *args, **kwargs)
@ -199,6 +201,7 @@ def find_release_package(mirror, workdir, package, version, source_release,
return srcpkg return srcpkg
def find_package(mirror, workdir, package, version, source_release, config): def find_package(mirror, workdir, package, version, source_release, config):
"Returns the SourcePackage" "Returns the SourcePackage"
if package.endswith('.dsc'): if package.endswith('.dsc'):
@ -217,6 +220,7 @@ def find_package(mirror, workdir, package, version, source_release, config):
return srcpkg return srcpkg
def get_backport_version(version, suffix, upload, release): def get_backport_version(version, suffix, upload, release):
distribution = codename_to_distribution(release) distribution = codename_to_distribution(release)
if not distribution: if not distribution:
@ -231,6 +235,7 @@ def get_backport_version(version, suffix, upload, release):
backport_version += '~ppa1' backport_version += '~ppa1'
return backport_version return backport_version
def get_old_version(source, release): def get_old_version(source, release):
try: try:
distribution = codename_to_distribution(release) distribution = codename_to_distribution(release)
@ -240,15 +245,17 @@ def get_old_version(source, release):
('Release', 'Security', 'Updates', ('Release', 'Security', 'Updates',
'Proposed', 'Backports')) 'Proposed', 'Backports'))
return pkg.getVersion() return pkg.getVersion()
except (SeriesNotFoundException, PackageNotFoundException) as e: except (SeriesNotFoundException, PackageNotFoundException):
pass pass
def get_backport_dist(release, release_pocket): def get_backport_dist(release, release_pocket):
if release_pocket: if release_pocket:
return release return release
else: else:
return '%s-backports' % release return '%s-backports' % release
def do_build(workdir, dsc, release, builder, update): def do_build(workdir, dsc, release, builder, update):
builder = get_builder(builder) builder = get_builder(builder)
if not builder: if not builder:
@ -264,9 +271,9 @@ def do_build(workdir, dsc, release, builder, update):
release, release,
os.path.join(workdir, "buildresult")) os.path.join(workdir, "buildresult"))
def do_upload(workdir, package, bp_version, changes, upload, prompt): def do_upload(workdir, package, bp_version, changes, upload, prompt):
print('Please check %s %s in file://%s carefully!' % \ print('Please check %s %s in file://%s carefully!' % (package, bp_version, workdir))
(package, bp_version, workdir))
if prompt or upload == 'ubuntu': if prompt or upload == 'ubuntu':
question = 'Do you want to upload the package to %s' % upload question = 'Do you want to upload the package to %s' % upload
answer = YesNoQuestion().ask(question, "yes") answer = YesNoQuestion().ask(question, "yes")
@ -275,6 +282,7 @@ def do_upload(workdir, package, bp_version, changes, upload, prompt):
check_call(['dput', upload, changes], cwd=workdir) check_call(['dput', upload, changes], cwd=workdir)
def orig_needed(upload, workdir, pkg): def orig_needed(upload, workdir, pkg):
'''Avoid a -sa if possible''' '''Avoid a -sa if possible'''
if not upload or not upload.startswith('ppa:'): if not upload or not upload.startswith('ppa:'):
@ -285,21 +293,20 @@ def orig_needed(upload, workdir, pkg):
version = pkg.version.upstream_version version = pkg.version.upstream_version
h = Http() h = Http()
for filename in glob.glob(os.path.join(workdir, for filename in glob.glob(os.path.join(workdir, '%s_%s.orig*' % (pkg.source, version))):
'%s_%s.orig*' % (pkg.source, version))):
url = ('https://launchpad.net/~%s/+archive/%s/+files/%s' url = ('https://launchpad.net/~%s/+archive/%s/+files/%s'
% (user, ppa, filename)) % (user, ppa, filename))
try: try:
headers, body = h.request(url, 'HEAD') headers, body = h.request(url, 'HEAD')
if (headers.status != 200 or if (headers.status != 200 or
not headers['content-location']. not headers['content-location'].startswith('https://launchpadlibrarian.net')):
startswith('https://launchpadlibrarian.net')):
return True return True
except HttpLib2Error as e: except HttpLib2Error as e:
Logger.info(e) Logger.info(e)
return True return True
return False return False
def do_backport(workdir, pkg, suffix, close, release, release_pocket, build, def do_backport(workdir, pkg, suffix, close, release, release_pocket, build,
builder, update, upload, keyid, prompt): builder, update, upload, keyid, prompt):
dirname = '%s-%s' % (pkg.source, release) dirname = '%s-%s' % (pkg.source, release)
@ -362,6 +369,7 @@ def do_backport(workdir, pkg, suffix, close, release, release_pocket, build,
shutil.rmtree(srcdir) shutil.rmtree(srcdir)
def main(args): def main(args):
ubu_email() ubu_email()
@ -412,5 +420,6 @@ def main(args):
if not opts.workdir: if not opts.workdir:
shutil.rmtree(workdir) shutil.rmtree(workdir)
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))

7
bitesize
View File

@ -30,20 +30,24 @@ from launchpadlib.errors import HTTPError
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
def error_out(msg): def error_out(msg):
Logger.error(msg) Logger.error(msg)
sys.exit(1) sys.exit(1)
def save_entry(entry): def save_entry(entry):
try: try:
entry.lp_save() entry.lp_save()
except HTTPError, error: except HTTPError, error:
error_out(error.content) error_out(error.content)
def tag_bug(bug): def tag_bug(bug):
bug.tags = bug.tags + ['bitesize'] # LP: #254901 workaround bug.tags = bug.tags + ['bitesize'] # LP: #254901 workaround
save_entry(bug) save_entry(bug)
def main(): def main():
usage = "Usage: %prog <bug number>" usage = "Usage: %prog <bug number>"
opt_parser = OptionParser(usage) opt_parser = OptionParser(usage)
@ -71,7 +75,7 @@ def main():
bug = launchpad.bugs[args[0]] bug = launchpad.bugs[args[0]]
except HTTPError, error: except HTTPError, error:
if error.response.status == 401: if error.response.status == 401:
error_out("Don't have enough permissions to access bug %s. %s" % \ error_out("Don't have enough permissions to access bug %s. %s" %
(args[0], error.content)) (args[0], error.content))
else: else:
raise raise
@ -84,5 +88,6 @@ def main():
bug.subscribe(person=launchpad.me) bug.subscribe(person=launchpad.me)
tag_bug(launchpad.bugs[bug.id]) # fresh bug object, LP: #336866 workaround tag_bug(launchpad.bugs[bug.id]) # fresh bug object, LP: #336866 workaround
if __name__ == '__main__': if __name__ == '__main__':
main() main()

1
check-mir
View File

@ -153,5 +153,6 @@ def main():
else: else:
print('All dependencies are supported in main or restricted.') print('All dependencies are supported in main or restricted.')
if __name__ == '__main__': if __name__ == '__main__':
main() main()

7
grep-merges
View File

@ -29,7 +29,8 @@ import ubuntutools.misc
def main(): def main():
parser = optparse.OptionParser(usage='%prog [options] [string]', parser = optparse.OptionParser(
usage='%prog [options] [string]',
description='List pending merges from Debian matching string') description='List pending merges from Debian matching string')
args = parser.parse_args()[1] args = parser.parse_args()[1]
@ -66,9 +67,9 @@ def main():
if merge.get('uploader'): if merge.get('uploader'):
uploader = '(%s)' % merge['uploader'] uploader = '(%s)' % merge['uploader']
pretty_uploader = u'{} {}'.format(author, uploader) pretty_uploader = u'{} {}'.format(author, uploader)
if (match is None or if match is None or match in package or match in author or match in uploader:
match in package or match in author or match in uploader):
print '%s\t%s' % (package.encode("utf-8"), pretty_uploader.encode("utf-8")) print '%s\t%s' % (package.encode("utf-8"), pretty_uploader.encode("utf-8"))
if __name__ == '__main__': if __name__ == '__main__':
main() main()

5
hugdaylist
View File

@ -36,6 +36,7 @@ from launchpadlib.launchpad import Launchpad
from ubuntutools.lp.libsupport import translate_web_api from ubuntutools.lp.libsupport import translate_web_api
def check_args(): def check_args():
howmany = -1 howmany = -1
url = "" url = ""
@ -65,6 +66,7 @@ def check_args():
return (howmany, url) return (howmany, url)
def filter_unsolved(task): def filter_unsolved(task):
# TODO: don't use this filter here, only check status and assignee of # TODO: don't use this filter here, only check status and assignee of
# the given task # the given task
@ -73,12 +75,13 @@ def filter_unsolved(task):
# this is expensive, parse name out of self_link instead? # this is expensive, parse name out of self_link instead?
subscriptions = set(s.person.name for s in task.bug.subscriptions) subscriptions = set(s.person.name for s in task.bug.subscriptions)
if (task.status != "Fix Committed" and if (task.status != "Fix Committed" and
(not task.assignee or task.assignee.name in ['motu','desktop-bugs']) and (not task.assignee or task.assignee.name in ['motu', 'desktop-bugs']) and
'ubuntu-sponsors' not in subscriptions and 'ubuntu-sponsors' not in subscriptions and
'ubuntu-archive' not in subscriptions): 'ubuntu-archive' not in subscriptions):
return True return True
return False return False
def main(): def main():
(howmany, url) = check_args() (howmany, url) = check_args()
if len(url.split("?", 1)) == 2: if len(url.split("?", 1)) == 2:

14
import-bug-from-debian
View File

@ -38,6 +38,7 @@ except ImportError:
Logger.error("Please install 'python-soappy' in order to use this utility.") Logger.error("Please install 'python-soappy' in order to use this utility.")
sys.exit(1) sys.exit(1)
def main(): def main():
bug_re = re.compile(r"bug=(\d+)") bug_re = re.compile(r"bug=(\d+)")
@ -46,8 +47,8 @@ def main():
debbugs = SOAPpy.SOAPProxy(url, namespace) debbugs = SOAPpy.SOAPProxy(url, namespace)
# debug # debug
#debbugs.config.dumpSOAPOut = 1 # debbugs.config.dumpSOAPOut = 1
#debbugs.config.dumpSOAPIn = 1 # debbugs.config.dumpSOAPIn = 1
parser = OptionParser(usage="%prog [option] bug ...") parser = OptionParser(usage="%prog [option] bug ...")
parser.add_option("-b", "--browserless", parser.add_option("-b", "--browserless",
@ -118,10 +119,10 @@ def main():
ubupackage) ubupackage)
sys.exit(1) sys.exit(1)
u_bug = launchpad.bugs.createBug(target=target, title=subject, u_bug = launchpad.bugs.createBug(
description='Imported from Debian bug ' target=target, title=subject,
'http://bugs.debian.org/%d:\n\n%s' description='Imported from Debian bug http://bugs.debian.org/%d:\n\n%s' %
% (bug_num, summary)) (bug_num, summary))
d_sp = debian.getSourcePackage(name=package) d_sp = debian.getSourcePackage(name=package)
if d_sp is None and options.package: if d_sp is None and options.package:
d_sp = debian.getSourcePackage(name=options.package) d_sp = debian.getSourcePackage(name=options.package)
@ -133,5 +134,6 @@ def main():
if not options.browserless: if not options.browserless:
webbrowser.open(u_bug.web_link) webbrowser.open(u_bug.web_link)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

9
merge-changelog
View File

@ -21,6 +21,7 @@
import re import re
import sys import sys
def usage(exit_code=1): def usage(exit_code=1):
print '''Usage: merge-changelog <left changelog> <right changelog> print '''Usage: merge-changelog <left changelog> <right changelog>
@ -35,10 +36,12 @@ Debian release of the package.
# Changelog Management # Changelog Management
######################################################################## ########################################################################
# Regular expression for top of debian/changelog # Regular expression for top of debian/changelog
CL_RE = re.compile(r'^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-0-9a-z]+)+)\;', CL_RE = re.compile(r'^(\w[-+0-9a-z.]*) \(([^\(\) \t]+)\)((\s+[-0-9a-z]+)+)\;',
re.IGNORECASE) re.IGNORECASE)
def merge_changelog(left_changelog, right_changelog): def merge_changelog(left_changelog, right_changelog):
"""Merge a changelog file.""" """Merge a changelog file."""
@ -60,6 +63,7 @@ def merge_changelog(left_changelog, right_changelog):
return False return False
def read_changelog(filename): def read_changelog(filename):
"""Return a parsed changelog file.""" """Return a parsed changelog file."""
entries = [] entries = []
@ -93,6 +97,7 @@ def read_changelog(filename):
return entries return entries
######################################################################## ########################################################################
# Version parsing code # Version parsing code
######################################################################## ########################################################################
@ -214,6 +219,7 @@ def strcut(string, idx, accept):
return (ret, idx) return (ret, idx)
def deb_order(string, idx): def deb_order(string, idx):
"""Return the comparison order of two characters.""" """Return the comparison order of two characters."""
if idx >= len(string): if idx >= len(string):
@ -223,6 +229,7 @@ def deb_order(string, idx):
else: else:
return CMP_TABLE.index(string[idx]) return CMP_TABLE.index(string[idx])
def deb_cmp_str(x, y): def deb_cmp_str(x, y):
"""Compare two strings in a deb version.""" """Compare two strings in a deb version."""
idx = 0 idx = 0
@ -237,6 +244,7 @@ def deb_cmp_str(x, y):
return 0 return 0
def deb_cmp(x, y): def deb_cmp(x, y):
"""Implement the string comparison outlined by Debian policy.""" """Implement the string comparison outlined by Debian policy."""
x_idx = y_idx = 0 x_idx = y_idx = 0
@ -270,5 +278,6 @@ def main():
merge_changelog(left_changelog, right_changelog) merge_changelog(left_changelog, right_changelog)
sys.exit(0) sys.exit(0)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

3
pbuilder-dist
View File

@ -490,11 +490,12 @@ def main():
sys.exit(1) sys.exit(1)
# Execute the pbuilder command # Execute the pbuilder command
if not '--debug-echo' in args: if '--debug-echo' not in args:
sys.exit(subprocess.call(app.get_command(args))) sys.exit(subprocess.call(app.get_command(args)))
else: else:
print app.get_command([arg for arg in args if arg != '--debug-echo']) print app.get_command([arg for arg in args if arg != '--debug-echo'])
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

3
pull-debian-debdiff
View File

@ -27,6 +27,7 @@ from ubuntutools.archive import DebianSourcePackage, DownloadError
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
def previous_version(package, version, distance): def previous_version(package, version, distance):
"Given an (extracted) package, determine the version distance versions ago" "Given an (extracted) package, determine the version distance versions ago"
upver = debian.debian_support.Version(version).upstream_version upver = debian.debian_support.Version(version).upstream_version
@ -43,6 +44,7 @@ def previous_version(package, version, distance):
seen += 1 seen += 1
return False return False
def main(): def main():
parser = optparse.OptionParser('%prog [options] <package> <version> ' parser = optparse.OptionParser('%prog [options] <package> <version> '
'[distance]') '[distance]')
@ -105,6 +107,7 @@ def main():
oldpkg.unpack() oldpkg.unpack()
print 'file://' + oldpkg.debdiff(newpkg, diffstat=True) print 'file://' + oldpkg.debdiff(newpkg, diffstat=True)
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

3
pull-debian-source
View File

@ -112,7 +112,7 @@ def main():
line = list(rmadison('debian', package, suite, 'source')) line = list(rmadison('debian', package, suite, 'source'))
if not line: if not line:
source_package = source_package_for(package, suite) source_package = source_package_for(package, suite)
if source_package != None and package != source_package: if source_package is not None and package != source_package:
package = source_package package = source_package
line = list(rmadison('debian', package, suite, 'source')) line = list(rmadison('debian', package, suite, 'source'))
if not line: if not line:
@ -135,6 +135,7 @@ def main():
if not options.download_only: if not options.download_only:
srcpkg.unpack() srcpkg.unpack()
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

1
pull-lp-source
View File

@ -141,6 +141,7 @@ def main():
if not options.download_only: if not options.download_only:
srcpkg.unpack() srcpkg.unpack()
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

16
pull-uca-source
View File

@ -26,20 +26,13 @@
import re import re
import json
import os
import sys import sys
import urllib2
from optparse import OptionParser from optparse import OptionParser
from distro_info import UbuntuDistroInfo, DistroDataOutdated
from ubuntutools.archive import UbuntuCloudArchiveSourcePackage, DownloadError from ubuntutools.archive import UbuntuCloudArchiveSourcePackage, DownloadError
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.lp.lpapicache import Distribution, Launchpad from ubuntutools.lp.lpapicache import Launchpad
from ubuntutools.lp.udtexceptions import (SeriesNotFoundException, from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
PackageNotFoundException,
PocketDoesNotExistError)
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.misc import split_release_pocket from ubuntutools.misc import split_release_pocket
@ -51,13 +44,13 @@ from launchpadlib.launchpad import Launchpad as LP
def showOpenstackReleases(uca): def showOpenstackReleases(uca):
releases = [] releases = []
for p in uca.ppas: for p in uca.ppas:
if re.match("\w*-staging", p.name): if re.match(r"\w*-staging", p.name):
releases.append(re.sub("-staging", "", p.name)) releases.append(re.sub("-staging", "", p.name))
Logger.error("Openstack releases are:\n\t%s", ", ".join(releases)) Logger.error("Openstack releases are:\n\t%s", ", ".join(releases))
def getSPPH(lp, archive, package, version=None, series=None, pocket=None, try_binary=True): def getSPPH(lp, archive, package, version=None, series=None, pocket=None, try_binary=True):
params = { 'exact_match': True, 'order_by_date': True, } params = {'exact_match': True, 'order_by_date': True}
if pocket: if pocket:
params['pocket'] = pocket params['pocket'] = pocket
if series: if series:
@ -156,6 +149,7 @@ def main():
if not options.download_only: if not options.download_only:
srcpkg.unpack() srcpkg.unpack()
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

19
requestbackport
View File

@ -75,11 +75,11 @@ def determine_destinations(source, destination):
def disclaimer(): def disclaimer():
print ("Ubuntu's backports are not for fixing bugs in stable releases, " print("Ubuntu's backports are not for fixing bugs in stable releases, "
"but for bringing new features to older, stable releases.") "but for bringing new features to older, stable releases.\n"
print ("See https://wiki.ubuntu.com/UbuntuBackports for the Ubuntu " "See https://wiki.ubuntu.com/UbuntuBackports for the Ubuntu "
"Backports policy and processes.") "Backports policy and processes.\n"
print ("See https://wiki.ubuntu.com/StableReleaseUpdates for the process " "See https://wiki.ubuntu.com/StableReleaseUpdates for the process "
"for fixing bugs in stable releases.") "for fixing bugs in stable releases.")
confirmation_prompt() confirmation_prompt()
@ -129,11 +129,9 @@ def find_rdepends(releases, published_binaries):
if rdep['Package'] in published_binaries: if rdep['Package'] in published_binaries:
continue continue
# arch==any queries return Reverse-Build-Deps: # arch==any queries return Reverse-Build-Deps:
if (arch == 'any' and rdep.get('Architectures', []) if arch == 'any' and rdep.get('Architectures', []) == ['source']:
== ['source']):
continue continue
intermediate[binpkg][rdep['Package']] \ intermediate[binpkg][rdep['Package']].append((release, relationship))
.append((release, relationship))
output = [] output = []
for binpkg, rdeps in intermediate.iteritems(): for binpkg, rdeps in intermediate.iteritems():
@ -240,8 +238,7 @@ def request_backport(package_spph, source, destinations):
+ testing + testing
+ [""] + [""]
+ find_rdepends(destinations, published_binaries) + find_rdepends(destinations, published_binaries)
+ [""] + [""]) % subst)
) % subst)
editor = EditBugReport(subject, body) editor = EditBugReport(subject, body)
editor.edit() editor.edit()

17
requestsync
View File

@ -42,6 +42,7 @@ from ubuntutools.question import confirmation_prompt, EditBugReport
# entry point # entry point
# #
def main(): def main():
# Our usage options. # Our usage options.
usage = ('Usage: %prog [options] ' usage = ('Usage: %prog [options] '
@ -208,9 +209,8 @@ def main():
ubuntu_version = Version('~') ubuntu_version = Version('~')
ubuntu_component = None # Set after getting the Debian info ubuntu_component = None # Set after getting the Debian info
if not newsource: if not newsource:
print ("'%s' doesn't exist in 'Ubuntu %s'.\n" print("'%s' doesn't exist in 'Ubuntu %s'.\nDo you want to sync a new package?" %
"Do you want to sync a new package?" (srcpkg, release))
% (srcpkg, release))
confirmation_prompt() confirmation_prompt()
newsource = True newsource = True
except udtexceptions.SeriesNotFoundException, error: except udtexceptions.SeriesNotFoundException, error:
@ -240,8 +240,7 @@ def main():
# try rmadison # try rmadison
import ubuntutools.requestsync.mail import ubuntutools.requestsync.mail
try: try:
debian_srcpkg = ubuntutools.requestsync.mail.get_debian_srcpkg( debian_srcpkg = ubuntutools.requestsync.mail.get_debian_srcpkg(srcpkg, distro)
srcpkg, distro)
debian_version = Version(debian_srcpkg.getVersion()) debian_version = Version(debian_srcpkg.getVersion())
debian_component = debian_srcpkg.getComponent() debian_component = debian_srcpkg.getComponent()
except udtexceptions.PackageNotFoundException, error: except udtexceptions.PackageNotFoundException, error:
@ -250,8 +249,7 @@ def main():
if ubuntu_version == debian_version: if ubuntu_version == debian_version:
print >> sys.stderr, ('E: The versions in Debian and Ubuntu are the ' print >> sys.stderr, ('E: The versions in Debian and Ubuntu are the '
'same already (%s). Aborting.' 'same already (%s). Aborting.' % ubuntu_version)
% ubuntu_version)
sys.exit(1) sys.exit(1)
if ubuntu_version > debian_version: if ubuntu_version > debian_version:
print >> sys.stderr, ('E: The version in Ubuntu (%s) is newer than ' print >> sys.stderr, ('E: The version in Ubuntu (%s) is newer than '
@ -283,7 +281,7 @@ def main():
if 'ubuntu' in str(ubuntu_version): if 'ubuntu' in str(ubuntu_version):
need_interaction = True need_interaction = True
print ('Changes have been made to the package in Ubuntu.\n' print('Changes have been made to the package in Ubuntu.\n'
'Please edit the report and give an explanation.\n' 'Please edit the report and give an explanation.\n'
'Not saving the report file will abort the request.') 'Not saving the report file will abort the request.')
report += (u'Explanation of the Ubuntu delta and why it can be ' report += (u'Explanation of the Ubuntu delta and why it can be '
@ -293,7 +291,7 @@ def main():
if ffe: if ffe:
need_interaction = True need_interaction = True
print ('To approve FeatureFreeze exception, you need to state\n' print('To approve FeatureFreeze exception, you need to state\n'
'the reason why you feel it is necessary.\n' 'the reason why you feel it is necessary.\n'
'Not saving the report file will abort the request.') 'Not saving the report file will abort the request.')
report += ('Explanation of FeatureFreeze exception:\n' report += ('Explanation of FeatureFreeze exception:\n'
@ -354,6 +352,7 @@ def main():
options.keyid, email_from, mailserver_host, mailserver_port, options.keyid, email_from, mailserver_host, mailserver_port,
mailserver_user, mailserver_pass) mailserver_user, mailserver_pass)
if __name__ == '__main__': if __name__ == '__main__':
try: try:
main() main()

6
reverse-depends
View File

@ -33,7 +33,8 @@ def main():
Logger.warn(e) Logger.warn(e)
default_release = 'unstable' default_release = 'unstable'
parser = optparse.OptionParser('%prog [options] package', parser = optparse.OptionParser(
'%prog [options] package',
description="List reverse-dependencies of package. " description="List reverse-dependencies of package. "
"If the package name is prefixed with src: then the " "If the package name is prefixed with src: then the "
"reverse-dependencies of all the binary packages that " "reverse-dependencies of all the binary packages that "
@ -51,8 +52,7 @@ def main():
help='Also consider Suggests relationships') help='Also consider Suggests relationships')
parser.add_option('-b', '--build-depends', parser.add_option('-b', '--build-depends',
action='store_const', dest='arch', const='source', action='store_const', dest='arch', const='source',
help='Query build dependencies (synonym for ' help='Query build dependencies (synonym for --arch=source)')
'--arch=source)')
parser.add_option('-a', '--arch', metavar='ARCH', default='any', parser.add_option('-a', '--arch', metavar='ARCH', default='any',
help='Query dependencies in ARCH. ' help='Query dependencies in ARCH. '
'Default: any') 'Default: any')

11
setup.py
View File

@ -10,7 +10,7 @@ import codecs
# look/set what version we have # look/set what version we have
changelog = "debian/changelog" changelog = "debian/changelog"
if os.path.exists(changelog): if os.path.exists(changelog):
head=codecs.open(changelog, 'r', 'utf-8', 'replace').readline() head = codecs.open(changelog, 'r', 'utf-8', 'replace').readline()
match = re.compile(".*\((.*)\).*").match(head) match = re.compile(".*\((.*)\).*").match(head)
if match: if match:
version = match.group(1) version = match.group(1)
@ -19,7 +19,8 @@ if sys.version_info[0] >= 3:
scripts = [] scripts = []
data_files = [] data_files = []
else: else:
scripts = ['404main', scripts = [
'404main',
'backportpackage', 'backportpackage',
'bitesize', 'bitesize',
'check-mir', 'check-mir',
@ -60,10 +61,12 @@ else:
] ]
if __name__ == '__main__': if __name__ == '__main__':
setup(name='ubuntu-dev-tools', setup(
name='ubuntu-dev-tools',
version=version, version=version,
scripts=scripts, scripts=scripts,
packages=['ubuntutools', packages=[
'ubuntutools',
'ubuntutools/lp', 'ubuntutools/lp',
'ubuntutools/requestsync', 'ubuntutools/requestsync',
'ubuntutools/sponsor_patch', 'ubuntutools/sponsor_patch',

6
sponsor-patch
View File

@ -23,8 +23,8 @@ import tempfile
from ubuntutools.builder import get_builder from ubuntutools.builder import get_builder
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.sponsor_patch.sponsor_patch import (sponsor_patch, from ubuntutools.sponsor_patch.sponsor_patch import sponsor_patch, check_dependencies
check_dependencies)
def parse(script_name): def parse(script_name):
"""Parse the command line parameters.""" """Parse the command line parameters."""
@ -99,6 +99,7 @@ def parse(script_name):
return (options, bug_number) return (options, bug_number)
def main(): def main():
script_name = os.path.basename(sys.argv[0]) script_name = os.path.basename(sys.argv[0])
(options, bug_number) = parse(script_name) (options, bug_number) = parse(script_name)
@ -128,5 +129,6 @@ def main():
if options.workdir is None: if options.workdir is None:
shutil.rmtree(workdir) shutil.rmtree(workdir)
if __name__ == "__main__": if __name__ == "__main__":
main() main()

3
submittodebian
View File

@ -39,7 +39,7 @@ from ubuntutools.update_maintainer import update_maintainer, restore_maintainer
try: try:
from debian.changelog import Changelog from debian.changelog import Changelog
except ImportError: except ImportError:
print (u"This utility requires modules from the «python-debian» package, " print(u"This utility requires modules from the «python-debian» package, "
u"which isn't currently installed.") u"which isn't currently installed.")
sys.exit(1) sys.exit(1)
@ -265,5 +265,6 @@ def main():
os.unlink(debdiff) os.unlink(debdiff)
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
if __name__ == '__main__': if __name__ == '__main__':
main() main()

5
syncpackage
View File

@ -208,7 +208,7 @@ def sync_dsc(src_pkg, debian_dist, release, name, email, bugs, ubuntu_mirror,
remove_signature(src_pkg.dsc_name) remove_signature(src_pkg.dsc_name)
if keyid is not False: if keyid is not False:
cmd = ["debsign", changes_filename] cmd = ["debsign", changes_filename]
if not keyid is None: if keyid is not None:
cmd.insert(1, "-k" + keyid) cmd.insert(1, "-k" + keyid)
Logger.command(cmd) Logger.command(cmd)
subprocess.check_call(cmd) subprocess.check_call(cmd)
@ -521,7 +521,8 @@ def parse():
help="Show what would be done, but don't actually do " help="Show what would be done, but don't actually do "
"it.") "it.")
no_lp = optparse.OptionGroup(parser, "Local sync preparation options", no_lp = optparse.OptionGroup(
parser, "Local sync preparation options",
"Options that only apply when using --no-lp. " "Options that only apply when using --no-lp. "
"WARNING: The use of --no-lp is not recommended for uploads " "WARNING: The use of --no-lp is not recommended for uploads "
"targeted at Ubuntu. " "targeted at Ubuntu. "

14
ubuntu-build
View File

@ -32,6 +32,7 @@ from ubuntutools.lp.udtexceptions import (SeriesNotFoundException,
from ubuntutools.lp.lpapicache import Distribution, PersonTeam from ubuntutools.lp.lpapicache import Distribution, PersonTeam
from ubuntutools.misc import split_release_pocket from ubuntutools.misc import split_release_pocket
def main(): def main():
# Usage. # Usage.
usage = "%prog <srcpackage> <release> <operation>\n\n" usage = "%prog <srcpackage> <release> <operation>\n\n"
@ -167,8 +168,8 @@ def main():
sys.exit(1) sys.exit(1)
# Output details. # Output details.
print ("The source version for '%s' in %s (%s) is at %s." print("The source version for '%s' in %s (%s) is at %s." %
% (package, release.capitalize(), component, version)) (package, release.capitalize(), component, version))
print "Current build status for this package:" print "Current build status for this package:"
@ -185,9 +186,8 @@ def main():
if build.can_be_rescored: if build.can_be_rescored:
# FIXME: make priority an option # FIXME: make priority an option
priority = 5000 priority = 5000
print 'Rescoring build %s to %d...' % \ print 'Rescoring build %s to %d...' % (build.arch_tag, priority)
(build.arch_tag, priority) build.rescore(score=priority)
build.rescore(score = priority)
else: else:
print 'Cannot rescore build on %s.' % build.arch_tag print 'Cannot rescore build on %s.' % build.arch_tag
if op == 'retry': if op == 'retry':
@ -197,12 +197,11 @@ def main():
else: else:
print 'Cannot retry build on %s.' % build.arch_tag print 'Cannot retry build on %s.' % build.arch_tag
# We are done # We are done
if done: if done:
sys.exit(0) sys.exit(0)
print ("No builds for '%s' found in the %s release - it may have been " print("No builds for '%s' found in the %s release - it may have been "
"built in a former release." % (package, release.capitalize())) "built in a former release." % (package, release.capitalize()))
sys.exit(0) sys.exit(0)
@ -272,5 +271,6 @@ def main():
print '' print ''
if __name__ == '__main__': if __name__ == '__main__':
main() main()

3
ubuntu-iso
View File

@ -25,6 +25,7 @@ import sys
from ubuntutools import subprocess from ubuntutools import subprocess
def extract(iso, path): def extract(iso, path):
command = ['isoinfo', '-R', '-i', iso, '-x', path] command = ['isoinfo', '-R', '-i', iso, '-x', path]
pipe = subprocess.Popen(command, stdout=subprocess.PIPE, pipe = subprocess.Popen(command, stdout=subprocess.PIPE,
@ -37,6 +38,7 @@ def extract(iso, path):
return stdout return stdout
def main(): def main():
desc = 'Given an ISO, %prog will display the Ubuntu version information' desc = 'Given an ISO, %prog will display the Ubuntu version information'
parser = optparse.OptionParser(usage='%prog [options] iso...', parser = optparse.OptionParser(usage='%prog [options] iso...',
@ -62,6 +64,7 @@ def main():
if err: if err:
sys.exit(1) sys.exit(1)
if __name__ == '__main__': if __name__ == '__main__':
main() main()
sys.exit(0) sys.exit(0)

16
ubuntu-upload-permission
View File

@ -110,18 +110,16 @@ def main():
pocket): pocket):
print "You can upload %s to %s." % (package, options.release) print "You can upload %s to %s." % (package, options.release)
else: else:
print ("You can not upload %s to %s, yourself." print("You can not upload %s to %s, yourself." % (package, options.release))
% (package, options.release))
if (series.status in ('Current Stable Release', 'Supported', 'Obsolete') if (series.status in ('Current Stable Release', 'Supported', 'Obsolete')
and pocket == 'Release'): and pocket == 'Release'):
print ("%s is in the '%s' state. " print("%s is in the '%s' state. You may want to query the %s-proposed pocket." %
"You may want to query the %s-proposed pocket." (release, series.status, release))
% (release, series.status, release))
else: else:
print ("But you can still contribute to it via the sponsorship " print("But you can still contribute to it via the sponsorship "
"process: https://wiki.ubuntu.com/SponsorshipProcess") "process: https://wiki.ubuntu.com/SponsorshipProcess")
if not options.list_uploaders: if not options.list_uploaders:
print ("To see who has the necessary upload rights, " print("To see who has the necessary upload rights, "
"use the --list-uploaders option.") "use the --list-uploaders option.")
sys.exit(1) sys.exit(1)
@ -133,8 +131,8 @@ def print_uploaders(uploaders, expand_teams=False, prefix=''):
recursion. recursion.
""" """
for uploader in sorted(uploaders, key=lambda p: p.display_name): for uploader in sorted(uploaders, key=lambda p: p.display_name):
print ("%s* %s (%s)%s" print("%s* %s (%s)%s" %
% (prefix, uploader.display_name, uploader.name, (prefix, uploader.display_name, uploader.name,
' [team]' if uploader.is_team else '')) ' [team]' if uploader.is_team else ''))
if expand_teams and uploader.is_team: if expand_teams and uploader.is_team:
print_uploaders(uploader.participants, True, prefix=prefix + ' ') print_uploaders(uploader.participants, True, prefix=prefix + ' ')

27
ubuntutools/archive.py
View File

@ -29,6 +29,7 @@ Approach:
from __future__ import with_statement, print_function from __future__ import with_statement, print_function
import codecs
import hashlib import hashlib
import os.path import os.path
try: try:
@ -36,19 +37,14 @@ try:
from urllib.parse import urlparse from urllib.parse import urlparse
from urllib.error import URLError, HTTPError from urllib.error import URLError, HTTPError
except ImportError: except ImportError:
from urllib2 import ProxyHandler, build_opener, urlopen from urllib2 import ProxyHandler, build_opener, urlopen, URLError, HTTPError
from urlparse import urlparse from urlparse import urlparse
from urllib2 import URLError, HTTPError
import re import re
import sys import sys
if sys.version_info[0] >= 3:
basestring = str
unicode = str
from debian.changelog import Changelog, Version from debian.changelog import Changelog, Version
import debian.deb822 import debian.deb822
import debian.debian_support import debian.debian_support
import codecs
import httplib2 import httplib2
from ubuntutools.config import UDTConfig from ubuntutools.config import UDTConfig
@ -57,6 +53,10 @@ from ubuntutools.lp.lpapicache import (Launchpad, Distribution,
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools import subprocess from ubuntutools import subprocess
if sys.version_info[0] >= 3:
basestring = str
unicode = str
class DownloadError(Exception): class DownloadError(Exception):
"Unable to pull a source package" "Unable to pull a source package"
@ -116,8 +116,7 @@ class Dsc(debian.deb822.Dsc):
if name not in their_checksums: if name not in their_checksums:
# file only in one dsc # file only in one dsc
continue continue
if (size != their_checksums[name][0] or if size != their_checksums[name][0] or checksum != their_checksums[name][1]:
checksum != their_checksums[name][1]):
return False return False
return True # one checksum is good enough return True # one checksum is good enough
return True return True
@ -176,12 +175,11 @@ class SourcePackage(object):
Launchpad.login_existing(self._lp) Launchpad.login_existing(self._lp)
else: else:
Launchpad.login_anonymously() Launchpad.login_anonymously()
spph = (Distribution(self.distribution).getArchive() spph = Distribution(self.distribution).getArchive().getPublishedSources(
.getPublishedSources(
source_name=self.source, source_name=self.source,
version=self.version.full_version, version=self.version.full_version,
exact_match=True, exact_match=True,
)) )
self._spph = SourcePackagePublishingHistory(spph[0]) self._spph = SourcePackagePublishingHistory(spph[0])
return self._spph return self._spph
@ -510,9 +508,8 @@ class DebianSourcePackage(SourcePackage):
try: try:
data = self.url_opener.open( data = self.url_opener.open(
'http://snapshot.debian.org' 'http://snapshot.debian.org/mr/package/%s/%s/srcfiles?fileinfo=1' %
'/mr/package/%s/%s/srcfiles?fileinfo=1' (self.source, self.version.full_version))
% (self.source, self.version.full_version))
reader = codecs.getreader('utf-8') reader = codecs.getreader('utf-8')
srcfiles = json.load(reader(data)) srcfiles = json.load(reader(data))
@ -543,7 +540,7 @@ class UbuntuCloudArchiveSourcePackage(UbuntuSourcePackage):
def __init__(self, uca_release, *args, **kwargs): def __init__(self, uca_release, *args, **kwargs):
super(UbuntuCloudArchiveSourcePackage, self).__init__(*args, **kwargs) super(UbuntuCloudArchiveSourcePackage, self).__init__(*args, **kwargs)
self._uca_release = uca_release self._uca_release = uca_release
self.masters = [ "http://ubuntu-cloud.archive.canonical.com/ubuntu/" ] self.masters = ["http://ubuntu-cloud.archive.canonical.com/ubuntu/"]
def _lp_url(self, filename): def _lp_url(self, filename):
"Build a source package URL on Launchpad" "Build a source package URL on Launchpad"

11
ubuntutools/builder.py
View File

@ -23,11 +23,13 @@ import os
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools import subprocess from ubuntutools import subprocess
def _build_preparation(result_directory): def _build_preparation(result_directory):
"""prepares the builder for building a package""" """prepares the builder for building a package"""
if not os.path.isdir(result_directory): if not os.path.isdir(result_directory):
os.makedirs(result_directory) os.makedirs(result_directory)
class Builder(object): class Builder(object):
def __init__(self, name): def __init__(self, name):
self.name = name self.name = name
@ -37,7 +39,7 @@ class Builder(object):
def _build_failure(self, returncode, dsc_file): def _build_failure(self, returncode, dsc_file):
if returncode != 0: if returncode != 0:
Logger.error("Failed to build %s from source with %s." % \ Logger.error("Failed to build %s from source with %s." %
(os.path.basename(dsc_file), self.name)) (os.path.basename(dsc_file), self.name))
return returncode return returncode
@ -55,7 +57,7 @@ class Builder(object):
def _update_failure(self, returncode, dist): def _update_failure(self, returncode, dist):
if returncode != 0: if returncode != 0:
Logger.error("Failed to update %s chroot for %s." % \ Logger.error("Failed to update %s chroot for %s." %
(dist, self.name)) (dist, self.name))
return returncode return returncode
@ -142,10 +144,10 @@ class Sbuild(Builder):
["sbuild-distupgrade"], ["sbuild-distupgrade"],
["sbuild-clean", "-a", "-c"]] ["sbuild-clean", "-a", "-c"]]
for cmd in commands: for cmd in commands:
#pylint: disable=W0631 # pylint: disable=W0631
Logger.command(cmd + [chroot]) Logger.command(cmd + [chroot])
ret = subprocess.call(cmd + [chroot]) ret = subprocess.call(cmd + [chroot])
#pylint: enable=W0631 # pylint: enable=W0631
if ret != 0: if ret != 0:
return self._update_failure(ret, dist) return self._update_failure(ret, dist)
return 0 return 0
@ -159,6 +161,7 @@ _SUPPORTED_BUILDERS = {
"sbuild": lambda: Sbuild(), "sbuild": lambda: Sbuild(),
} }
def get_builder(name): def get_builder(name):
if name in _SUPPORTED_BUILDERS: if name in _SUPPORTED_BUILDERS:
builder = _SUPPORTED_BUILDERS[name]() builder = _SUPPORTED_BUILDERS[name]()

9
ubuntutools/config.py
View File

@ -25,6 +25,7 @@ import locale
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
class UDTConfig(object): class UDTConfig(object):
"""Ubuntu Dev Tools configuration file (devscripts config file) and """Ubuntu Dev Tools configuration file (devscripts config file) and
environment variable parsing. environment variable parsing.
@ -140,12 +141,8 @@ def ubu_email(name=None, email=None, export=True):
if export and not name and not email and 'UBUMAIL' not in os.environ: if export and not name and not email and 'UBUMAIL' not in os.environ:
export = False export = False
for var, target in (('UBUMAIL', 'email'), for var, target in (('UBUMAIL', 'email'), ('DEBFULLNAME', 'name'), ('DEBEMAIL', 'email'),
('DEBFULLNAME', 'name'), ('EMAIL', 'email'), ('NAME', 'name')):
('DEBEMAIL', 'email'),
('EMAIL', 'email'),
('NAME', 'name'),
):
if name and email: if name and email:
break break
if var in os.environ: if var in os.environ:

6
ubuntutools/lp/__init__.py
View File

@ -1,6 +1,6 @@
## #
## ubuntu-dev-tools Launchpad Python modules. # ubuntu-dev-tools Launchpad Python modules.
## #
service = 'production' service = 'production'
api_version = '1.0' api_version = '1.0'

7
ubuntutools/lp/libsupport.py
View File

@ -25,6 +25,7 @@ except ImportError:
from urllib import urlencode from urllib import urlencode
from urlparse import urlsplit, urlunsplit from urlparse import urlsplit, urlunsplit
def query_to_dict(query_string): def query_to_dict(query_string):
result = dict() result = dict()
options = filter(None, query_string.split("&")) options = filter(None, query_string.split("&"))
@ -33,6 +34,7 @@ def query_to_dict(query_string):
result.setdefault(key, set()).add(value) result.setdefault(key, set()).add(value)
return result return result
def translate_web_api(url, launchpad): def translate_web_api(url, launchpad):
scheme, netloc, path, query, fragment = urlsplit(url) scheme, netloc, path, query, fragment = urlsplit(url)
query = query_to_dict(query) query = query_to_dict(query)
@ -45,10 +47,9 @@ def translate_web_api(url, launchpad):
if path.endswith("/+bugs"): if path.endswith("/+bugs"):
path = path[:-6] path = path[:-6]
if "ws.op" in query: if "ws.op" in query:
raise ValueError("Invalid web url, url: %s" %url) raise ValueError("Invalid web url, url: %s" % url)
query["ws.op"] = "searchTasks" query["ws.op"] = "searchTasks"
scheme, netloc, api_path, _, _ = urlsplit(str(launchpad._root_uri)) scheme, netloc, api_path, _, _ = urlsplit(str(launchpad._root_uri))
query = urlencode(query) query = urlencode(query)
url = urlunsplit((scheme, netloc, api_path + path.lstrip("/"), url = urlunsplit((scheme, netloc, api_path + path.lstrip("/"), query, fragment))
query, fragment))
return url return url

91
ubuntutools/lp/lpapicache.py
View File

@ -24,16 +24,32 @@
from __future__ import print_function from __future__ import print_function
# Uncomment for tracing LP API calls # Uncomment for tracing LP API calls
#import httplib2 # import httplib2
#httplib2.debuglevel = 1 # httplib2.debuglevel = 1
import collections
import sys import sys
from debian.changelog import Changelog, Version
from httplib2 import Http, HttpLib2Error
from launchpadlib.launchpad import Launchpad as LP
from launchpadlib.errors import HTTPError
from lazr.restfulclient.resource import Entry
from ubuntutools.lp import (service, api_version)
from ubuntutools.lp.udtexceptions import (AlreadyLoggedInError,
ArchiveNotFoundException,
ArchSeriesNotFoundException,
PackageNotFoundException,
PocketDoesNotExistError,
SeriesNotFoundException)
if sys.version_info[0] >= 3: if sys.version_info[0] >= 3:
basestring = str basestring = str
unicode = str unicode = str
#Shameless steal from python-six
# Shameless steal from python-six
def add_metaclass(metaclass): def add_metaclass(metaclass):
"""Class decorator for creating a class with a metaclass.""" """Class decorator for creating a class with a metaclass."""
def wrapper(cls): def wrapper(cls):
@ -49,20 +65,6 @@ def add_metaclass(metaclass):
return metaclass(cls.__name__, cls.__bases__, orig_vars) return metaclass(cls.__name__, cls.__bases__, orig_vars)
return wrapper return wrapper
from debian.changelog import Changelog, Version
from httplib2 import Http, HttpLib2Error
from launchpadlib.launchpad import Launchpad as LP
from launchpadlib.errors import HTTPError
from lazr.restfulclient.resource import Entry
from ubuntutools.lp import (service, api_version)
from ubuntutools.lp.udtexceptions import (AlreadyLoggedInError,
ArchiveNotFoundException,
ArchSeriesNotFoundException,
PackageNotFoundException,
PocketDoesNotExistError,
SeriesNotFoundException)
import collections
__all__ = [ __all__ = [
'Archive', 'Archive',
@ -121,6 +123,8 @@ class _Launchpad(object):
def __call__(self): def __call__(self):
return self return self
Launchpad = _Launchpad() Launchpad = _Launchpad()
@ -131,7 +135,7 @@ class MetaWrapper(type):
def __init__(cls, name, bases, attrd): def __init__(cls, name, bases, attrd):
super(MetaWrapper, cls).__init__(name, bases, attrd) super(MetaWrapper, cls).__init__(name, bases, attrd)
if 'resource_type' not in attrd: if 'resource_type' not in attrd:
raise TypeError('Class "%s" needs an associated resource type' % \ raise TypeError('Class "%s" needs an associated resource type' %
name) name)
cls._cache = dict() cls._cache = dict()
@ -144,8 +148,7 @@ class BaseWrapper(object):
resource_type = None # it's a base class after all resource_type = None # it's a base class after all
def __new__(cls, data): def __new__(cls, data):
if (isinstance(data, basestring) and if isinstance(data, basestring) and data.startswith(str(Launchpad._root_uri)):
data.startswith(str(Launchpad._root_uri))):
# looks like a LP API URL # looks like a LP API URL
# check if it's already cached # check if it's already cached
cached = cls._cache.get(data) cached = cls._cache.get(data)
@ -161,8 +164,7 @@ class BaseWrapper(object):
if isinstance(data, Entry): if isinstance(data, Entry):
(service_root, resource_type) = data.resource_type_link.split('#') (service_root, resource_type) = data.resource_type_link.split('#')
if (service_root == str(Launchpad._root_uri) and if service_root == str(Launchpad._root_uri) and resource_type in cls.resource_type:
resource_type in cls.resource_type):
# check if it's already cached # check if it's already cached
cached = cls._cache.get(data.self_link) cached = cls._cache.get(data.self_link)
if not cached: if not cached:
@ -254,7 +256,7 @@ class Distribution(BaseWrapper):
(archive, self.display_name) (archive, self.display_name)
raise ArchiveNotFoundException(message) raise ArchiveNotFoundException(message)
else: else:
if not '_main_archive' in self.__dict__: if '_main_archive' not in self.__dict__:
self._main_archive = Archive(self.main_archive_link) self._main_archive = Archive(self.main_archive_link)
return self._main_archive return self._main_archive
@ -266,8 +268,7 @@ class Distribution(BaseWrapper):
''' '''
if name_or_version not in self._series: if name_or_version not in self._series:
try: try:
series = DistroSeries( series = DistroSeries(self().getSeries(name_or_version=name_or_version))
self().getSeries(name_or_version=name_or_version))
# Cache with name and version # Cache with name and version
self._series[series.name] = series self._series[series.name] = series
self._series[series.version] = series self._series[series.version] = series
@ -492,10 +493,9 @@ class Archive(BaseWrapper):
''' '''
if component_name not in self._component_uploaders: if component_name not in self._component_uploaders:
self._component_uploaders[component_name] = sorted(set( self._component_uploaders[component_name] = sorted(set(
PersonTeam(permission.person_link) PersonTeam(permission.person_link) for permission in
for permission in self._lpobject.getUploadersForComponent( self._lpobject.getUploadersForComponent(component_name=component_name)
component_name=component_name ))
)))
return self._component_uploaders[component_name] return self._component_uploaders[component_name]
def getUploadersForPackage(self, source_package_name): def getUploadersForPackage(self, source_package_name):
@ -504,10 +504,9 @@ class Archive(BaseWrapper):
''' '''
if source_package_name not in self._pkg_uploaders: if source_package_name not in self._pkg_uploaders:
self._pkg_uploaders[source_package_name] = sorted(set( self._pkg_uploaders[source_package_name] = sorted(set(
PersonTeam(permission.person_link) PersonTeam(permission.person_link) for permission in
for permission in self._lpobject.getUploadersForPackage( self._lpobject.getUploadersForPackage(source_package_name=source_package_name)
source_package_name=source_package_name ))
)))
return self._pkg_uploaders[source_package_name] return self._pkg_uploaders[source_package_name]
def getUploadersForPackageset(self, packageset, direct_permissions=False): def getUploadersForPackageset(self, packageset, direct_permissions=False):
@ -517,11 +516,12 @@ class Archive(BaseWrapper):
key = (packageset, direct_permissions) key = (packageset, direct_permissions)
if key not in self._pkgset_uploaders: if key not in self._pkgset_uploaders:
self._pkgset_uploaders[key] = sorted(set( self._pkgset_uploaders[key] = sorted(set(
PersonTeam(permission.person_link) PersonTeam(permission.person_link) for permission in
for permission in self._lpobject.getUploadersForPackageset( self._lpobject.getUploadersForPackageset(
packageset=packageset._lpobject, packageset=packageset._lpobject,
direct_permissions=direct_permissions, direct_permissions=direct_permissions,
))) )
))
return self._pkgset_uploaders[key] return self._pkgset_uploaders[key]
@ -576,9 +576,8 @@ class SourcePackagePublishingHistory(BaseWrapper):
if self._changelog is None: if self._changelog is None:
url = self._lpobject.changelogUrl() url = self._lpobject.changelogUrl()
if url is None: if url is None:
print(('E: No changelog available for %s %s', print('E: No changelog available for %s %s' %
(self.getPackageName(), (self.getPackageName(), self.getVersion()), file=sys.stderr)
self.getVersion())), file=sys.stderr)
return None return None
try: try:
@ -587,8 +586,7 @@ class SourcePackagePublishingHistory(BaseWrapper):
print(str(e), file=sys.stderr) print(str(e), file=sys.stderr)
return None return None
if response.status != 200: if response.status != 200:
print(('%s: %s %s' % (url, response.status, print('%s: %s %s' % (url, response.status, response.reason), file=sys.stderr)
response.reason)), file=sys.stderr)
return None return None
self._changelog = changelog self._changelog = changelog
@ -727,10 +725,7 @@ class PersonTeam(BaseWrapper):
Wrapper class around a LP person or team object. Wrapper class around a LP person or team object.
''' '''
resource_type = ( resource_type = ('person', 'team')
'person',
'team',
)
def __init__(self, *args): def __init__(self, *args):
# Don't share _upload between different PersonTeams # Don't share _upload between different PersonTeams
@ -866,9 +861,7 @@ class Packageset(BaseWrapper):
if distroseries is not None: if distroseries is not None:
params['distroseries'] = distroseries._lpobject params['distroseries'] = distroseries._lpobject
cls._source_sets[key] = [ cls._source_sets[key] = [Packageset(packageset) for packageset in
Packageset(packageset) for packageset cls._lp_packagesets.setsIncludingSource(**params)]
in cls._lp_packagesets.setsIncludingSource(**params)
]
return cls._source_sets[key] return cls._source_sets[key]

5
ubuntutools/lp/udtexceptions.py
View File

@ -2,22 +2,27 @@ class PackageNotFoundException(BaseException):
""" Thrown when a package is not found """ """ Thrown when a package is not found """
pass pass
class SeriesNotFoundException(BaseException): class SeriesNotFoundException(BaseException):
""" Thrown when a distroseries is not found """ """ Thrown when a distroseries is not found """
pass pass
class PocketDoesNotExistError(Exception): class PocketDoesNotExistError(Exception):
'''Raised when a invalid pocket is used.''' '''Raised when a invalid pocket is used.'''
pass pass
class ArchiveNotFoundException(BaseException): class ArchiveNotFoundException(BaseException):
""" Thrown when an archive for a distibution is not found """ """ Thrown when an archive for a distibution is not found """
pass pass
class AlreadyLoggedInError(Exception): class AlreadyLoggedInError(Exception):
'''Raised when a second login is attempted.''' '''Raised when a second login is attempted.'''
pass pass
class ArchSeriesNotFoundException(BaseException): class ArchSeriesNotFoundException(BaseException):
"""Thrown when a distroarchseries is not found.""" """Thrown when a distroarchseries is not found."""
pass pass

27
ubuntutools/misc.py
View File

@ -35,6 +35,8 @@ from ubuntutools.lp.udtexceptions import PocketDoesNotExistError
from ubuntutools.subprocess import Popen, PIPE from ubuntutools.subprocess import Popen, PIPE
_system_distribution_chain = [] _system_distribution_chain = []
def system_distribution_chain(): def system_distribution_chain():
""" system_distribution_chain() -> [string] """ system_distribution_chain() -> [string]
@ -51,8 +53,7 @@ def system_distribution_chain():
stdout=PIPE) stdout=PIPE)
_system_distribution_chain.append(p.communicate()[0].strip()) _system_distribution_chain.append(p.communicate()[0].strip())
except OSError: except OSError:
print ('Error: Could not determine what distribution you are ' print('Error: Could not determine what distribution you are running.')
'running.')
return [] return []
while True: while True:
@ -74,6 +75,7 @@ def system_distribution_chain():
return _system_distribution_chain return _system_distribution_chain
def system_distribution(): def system_distribution():
""" system_distro() -> string """ system_distro() -> string
@ -83,6 +85,7 @@ def system_distribution():
""" """
return system_distribution_chain()[0] return system_distribution_chain()[0]
def host_architecture(): def host_architecture():
""" host_architecture -> string """ host_architecture -> string
@ -90,16 +93,16 @@ def host_architecture():
architecture can't be determined, print an error message and return None. architecture can't be determined, print an error message and return None.
""" """
arch = Popen(['dpkg', '--print-architecture'], stdout=PIPE, \ arch = Popen(['dpkg', '--print-architecture'], stdout=PIPE,
stderr=PIPE).communicate()[0].split() stderr=PIPE).communicate()[0].split()
if not arch or 'not found' in arch[0]: if not arch or 'not found' in arch[0]:
print('Error: Not running on a Debian based system; could not ' \ print('Error: Not running on a Debian based system; could not detect its architecture.')
'detect its architecture.')
return None return None
return arch[0] return arch[0]
def readlist(filename, uniq=True): def readlist(filename, uniq=True):
""" readlist(filename, uniq) -> list """ readlist(filename, uniq) -> list
@ -124,6 +127,7 @@ def readlist(filename, uniq=True):
return items return items
def split_release_pocket(release, default='Release'): def split_release_pocket(release, default='Release'):
'''Splits the release and pocket name. '''Splits the release and pocket name.
@ -141,23 +145,23 @@ def split_release_pocket(release, default='Release'):
(release, pocket) = release.rsplit('-', 1) (release, pocket) = release.rsplit('-', 1)
pocket = pocket.capitalize() pocket = pocket.capitalize()
if pocket not in ('Release', 'Security', 'Updates', 'Proposed', if pocket not in ('Release', 'Security', 'Updates', 'Proposed', 'Backports'):
'Backports'): raise PocketDoesNotExistError("Pocket '%s' does not exist." % pocket)
raise PocketDoesNotExistError("Pocket '%s' does not exist." % \
pocket)
return (release, pocket) return (release, pocket)
def require_utf8(): def require_utf8():
'''Can be called by programs that only function in UTF-8 locales''' '''Can be called by programs that only function in UTF-8 locales'''
if locale.getpreferredencoding() != 'UTF-8': if locale.getpreferredencoding() != 'UTF-8':
print(("This program only functions in a UTF-8 locale. " print("This program only functions in a UTF-8 locale. Aborting.", file=sys.stderr)
"Aborting."), file=sys.stderr)
sys.exit(1) sys.exit(1)
_vendor_to_distroinfo = {"Debian": distro_info.DebianDistroInfo, _vendor_to_distroinfo = {"Debian": distro_info.DebianDistroInfo,
"Ubuntu": distro_info.UbuntuDistroInfo} "Ubuntu": distro_info.UbuntuDistroInfo}
def vendor_to_distroinfo(vendor): def vendor_to_distroinfo(vendor):
""" vendor_to_distroinfo(string) -> DistroInfo class """ vendor_to_distroinfo(string) -> DistroInfo class
@ -167,6 +171,7 @@ def vendor_to_distroinfo(vendor):
""" """
return _vendor_to_distroinfo.get(vendor) return _vendor_to_distroinfo.get(vendor)
def codename_to_distribution(codename): def codename_to_distribution(codename):
""" codename_to_distribution(string) -> string """ codename_to_distribution(string) -> string

12
ubuntutools/question.py
View File

@ -22,12 +22,12 @@ import tempfile
import os import os
import re import re
import sys import sys
if sys.version_info[0] < 3:
input = raw_input
import ubuntutools.subprocess import ubuntutools.subprocess
if sys.version_info[0] < 3:
input = raw_input # noqa
class Question(object): class Question(object):
def __init__(self, options, show_help=True): def __init__(self, options, show_help=True):
@ -73,8 +73,7 @@ class Question(object):
if selected == option[0]: if selected == option[0]:
selected = option selected = option
if selected not in self.options: if selected not in self.options:
print("Please answer the question with " + \ print("Please answer the question with " + self.get_options() + ".")
self.get_options() + ".")
return selected return selected
@ -101,8 +100,7 @@ def input_number(question, min_number, max_number, default=None):
try: try:
selected = int(selected) selected = int(selected)
if selected < min_number or selected > max_number: if selected < min_number or selected > max_number:
print("Please input a number between %i and %i." % \ print("Please input a number between %i and %i." % (min_number, max_number))
(min_number, max_number))
except ValueError: except ValueError:
print("Please input a number.") print("Please input a number.")
assert type(selected) == int assert type(selected) == int

5
ubuntutools/requestsync/lp.py
View File

@ -82,6 +82,7 @@ team.''')
return need_sponsor return need_sponsor
def check_existing_reports(srcpkg): def check_existing_reports(srcpkg):
''' '''
Check existing bug reports on Launchpad for a possible sync request. Check existing bug reports on Launchpad for a possible sync request.
@ -108,6 +109,7 @@ def check_existing_reports(srcpkg):
% (bug.title, bug.web_link)) % (bug.title, bug.web_link))
confirmation_prompt() confirmation_prompt()
def get_ubuntu_delta_changelog(srcpkg): def get_ubuntu_delta_changelog(srcpkg):
''' '''
Download the Ubuntu changelog and extract the entries since the last sync Download the Ubuntu changelog and extract the entries since the last sync
@ -153,6 +155,7 @@ def get_ubuntu_delta_changelog(srcpkg):
return '\n'.join(delta) return '\n'.join(delta)
def post_bug(srcpkg, subscribe, status, bugtitle, bugtext): def post_bug(srcpkg, subscribe, status, bugtitle, bugtext):
''' '''
Use the LP API to file the sync request. Use the LP API to file the sync request.
@ -181,7 +184,7 @@ def post_bug(srcpkg, subscribe, status, bugtitle, bugtext):
task.status = status task.status = status
task.lp_save() task.lp_save()
bug.subscribe(person = PersonTeam(subscribe)()) bug.subscribe(person=PersonTeam(subscribe)())
print('Sync request filed as bug #%i: %s' print('Sync request filed as bug #%i: %s'
% (bug.id, bug.web_link)) % (bug.id, bug.web_link))

46
ubuntutools/requestsync/mail.py
View File

@ -29,10 +29,6 @@ import smtplib
import socket import socket
import tempfile import tempfile
if sys.version_info[0] >= 3:
basestring = str
unicode = str
from debian.changelog import Changelog, Version from debian.changelog import Changelog, Version
from distro_info import DebianDistroInfo, DistroDataOutdated from distro_info import DebianDistroInfo, DistroDataOutdated
@ -42,6 +38,11 @@ from ubuntutools.logger import Logger
from ubuntutools.question import confirmation_prompt, YesNoQuestion from ubuntutools.question import confirmation_prompt, YesNoQuestion
from ubuntutools import subprocess from ubuntutools import subprocess
if sys.version_info[0] >= 3:
basestring = str
unicode = str
__all__ = [ __all__ = [
'get_debian_srcpkg', 'get_debian_srcpkg',
'get_ubuntu_srcpkg', 'get_ubuntu_srcpkg',
@ -51,6 +52,7 @@ __all__ = [
'mail_bug', 'mail_bug',
] ]
def _get_srcpkg(distro, name, release): def _get_srcpkg(distro, name, release):
if distro == 'debian': if distro == 'debian':
# Canonicalise release: # Canonicalise release:
@ -64,33 +66,33 @@ def _get_srcpkg(distro, name, release):
if not lines: if not lines:
lines = list(rmadison(distro, name, suite=release, arch='source')) lines = list(rmadison(distro, name, suite=release, arch='source'))
if not lines: if not lines:
raise PackageNotFoundException("'%s' doesn't appear to exist " raise PackageNotFoundException("'%s' doesn't appear to exist in %s '%s'" %
"in %s '%s'" (name, distro.capitalize(), release))
% (name, distro.capitalize(),
release))
pkg = max(lines, key=lambda x: Version(x['version'])) pkg = max(lines, key=lambda x: Version(x['version']))
return FakeSPPH(pkg['source'], pkg['version'], pkg['component'], distro) return FakeSPPH(pkg['source'], pkg['version'], pkg['component'], distro)
def get_debian_srcpkg(name, release): def get_debian_srcpkg(name, release):
return _get_srcpkg('debian', name, release) return _get_srcpkg('debian', name, release)
def get_ubuntu_srcpkg(name, release): def get_ubuntu_srcpkg(name, release):
return _get_srcpkg('ubuntu', name, release) return _get_srcpkg('ubuntu', name, release)
def need_sponsorship(name, component, release): def need_sponsorship(name, component, release):
''' '''
Ask the user if he has upload permissions for the package or the Ask the user if he has upload permissions for the package or the
component. component.
''' '''
val = YesNoQuestion().ask("Do you have upload permissions for the " val = YesNoQuestion().ask("Do you have upload permissions for the '%s' component or "
"'%s' component or the package '%s' in " "the package '%s' in Ubuntu %s?\nIf in doubt answer 'n'." %
"Ubuntu %s?\n" (component, name, release), 'no')
"If in doubt answer 'n'."
% (component, name, release), 'no')
return val == 'no' return val == 'no'
def check_existing_reports(srcpkg): def check_existing_reports(srcpkg):
''' '''
Point the user to the URL to manually check for duplicate bug reports. Point the user to the URL to manually check for duplicate bug reports.
@ -100,6 +102,7 @@ def check_existing_reports(srcpkg):
'for duplicate sync requests before continuing.' % srcpkg) 'for duplicate sync requests before continuing.' % srcpkg)
confirmation_prompt() confirmation_prompt()
def get_ubuntu_delta_changelog(srcpkg): def get_ubuntu_delta_changelog(srcpkg):
''' '''
Download the Ubuntu changelog and extract the entries since the last sync Download the Ubuntu changelog and extract the entries since the last sync
@ -119,6 +122,7 @@ def get_ubuntu_delta_changelog(srcpkg):
return u'\n'.join(delta) return u'\n'.join(delta)
def mail_bug(srcpkg, subscribe, status, bugtitle, bugtext, bug_mail_domain, def mail_bug(srcpkg, subscribe, status, bugtitle, bugtext, bug_mail_domain,
keyid, myemailaddr, mailserver_host, mailserver_port, keyid, myemailaddr, mailserver_host, mailserver_port,
mailserver_user, mailserver_pass): mailserver_user, mailserver_pass):
@ -177,9 +181,11 @@ Content-Type: text/plain; charset=UTF-8
confirmation_prompt() confirmation_prompt()
# save mail in temporary file # save mail in temporary file
backup = tempfile.NamedTemporaryFile(mode='w', delete=False, backup = tempfile.NamedTemporaryFile(
prefix='requestsync-' + re.sub(r'[^a-zA-Z0-9_-]', '', mode='w',
bugtitle.replace(' ', '_'))) delete=False,
prefix='requestsync-' + re.sub(r'[^a-zA-Z0-9_-]', '', bugtitle.replace(' ', '_'))
)
with backup: with backup:
backup.write(mail) backup.write(mail)
@ -201,8 +207,8 @@ Content-Type: text/plain; charset=UTF-8
Logger.error('Could not connect to %s:%s: %s (%i)', Logger.error('Could not connect to %s:%s: %s (%i)',
mailserver_host, mailserver_port, s[1], s[0]) mailserver_host, mailserver_port, s[1], s[0])
if s.smtp_code == 421: if s.smtp_code == 421:
confirmation_prompt(message='This is a temporary error, press ' confirmation_prompt(message='This is a temporary error, press [Enter] '
'[Enter] to retry. Press [Ctrl-C] to abort now.') 'to retry. Press [Ctrl-C] to abort now.')
if mailserver_user and mailserver_pass: if mailserver_user and mailserver_pass:
try: try:
@ -228,8 +234,8 @@ Content-Type: text/plain; charset=UTF-8
smtp_code, smtp_message = smtperror.recipients[to] smtp_code, smtp_message = smtperror.recipients[to]
Logger.error('Error while sending: %i, %s', smtp_code, smtp_message) Logger.error('Error while sending: %i, %s', smtp_code, smtp_message)
if smtp_code == 450: if smtp_code == 450:
confirmation_prompt(message='This is a temporary error, press ' confirmation_prompt(message='This is a temporary error, press [Enter] '
'[Enter] to retry. Press [Ctrl-C] to abort now.') 'to retry. Press [Ctrl-C] to abort now.')
else: else:
return return
except smtplib.SMTPResponseException as e: except smtplib.SMTPResponseException as e:

1
ubuntutools/sponsor_patch/bugtask.py
View File

@ -29,6 +29,7 @@ import httplib2
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
def is_sync(bug): def is_sync(bug):
"""Checks if a Launchpad bug is a sync request. """Checks if a Launchpad bug is a sync request.

12
ubuntutools/sponsor_patch/patch.py
View File

@ -23,6 +23,7 @@ from ubuntutools.logger import Logger
from ubuntutools.sponsor_patch.question import ask_for_manual_fixing from ubuntutools.sponsor_patch.question import ask_for_manual_fixing
from functools import reduce from functools import reduce
class Patch(object): class Patch(object):
"""This object represents a patch that can be downloaded from Launchpad.""" """This object represents a patch that can be downloaded from Launchpad."""
@ -31,7 +32,7 @@ class Patch(object):
self._patch_file = re.sub(" |/", "_", patch.title) self._patch_file = re.sub(" |/", "_", patch.title)
if not reduce(lambda r, x: r or self._patch.title.endswith(x), if not reduce(lambda r, x: r or self._patch.title.endswith(x),
(".debdiff", ".diff", ".patch"), False): (".debdiff", ".diff", ".patch"), False):
Logger.info("Patch %s does not have a proper file extension." % \ Logger.info("Patch %s does not have a proper file extension." %
(self._patch.title)) (self._patch.title))
self._patch_file += ".patch" self._patch_file += ".patch"
self._full_path = os.path.realpath(self._patch_file) self._full_path = os.path.realpath(self._patch_file)
@ -39,8 +40,7 @@ class Patch(object):
def apply(self, task): def apply(self, task):
"""Applies the patch in the current directory.""" """Applies the patch in the current directory."""
assert self._changed_files is not None, \ assert self._changed_files is not None, "You forgot to download the patch."
"You forgot to download the patch."
edit = False edit = False
if self.is_debdiff(): if self.is_debdiff():
cmd = ["patch", "--merge", "--force", "-p", cmd = ["patch", "--merge", "--force", "-p",
@ -77,8 +77,7 @@ class Patch(object):
def get_strip_level(self): def get_strip_level(self):
"""Returns the stript level for the patch.""" """Returns the stript level for the patch."""
assert self._changed_files is not None, \ assert self._changed_files is not None, "You forgot to download the patch."
"You forgot to download the patch."
strip_level = None strip_level = None
if self.is_debdiff(): if self.is_debdiff():
changelog = [f for f in self._changed_files changelog = [f for f in self._changed_files
@ -88,7 +87,6 @@ class Patch(object):
def is_debdiff(self): def is_debdiff(self):
"""Checks if the patch is a debdiff (= modifies debian/changelog).""" """Checks if the patch is a debdiff (= modifies debian/changelog)."""
assert self._changed_files is not None, \ assert self._changed_files is not None, "You forgot to download the patch."
"You forgot to download the patch."
return len([f for f in self._changed_files return len([f for f in self._changed_files
if f.endswith("debian/changelog")]) > 0 if f.endswith("debian/changelog")]) > 0

3
ubuntutools/sponsor_patch/question.py
View File

@ -21,6 +21,7 @@ import sys
from ubuntutools.question import Question, YesNoQuestion from ubuntutools.question import Question, YesNoQuestion
def ask_for_ignoring_or_fixing(): def ask_for_ignoring_or_fixing():
"""Ask the user to resolve an issue manually or ignore it. """Ask the user to resolve an issue manually or ignore it.
@ -34,6 +35,7 @@ def ask_for_ignoring_or_fixing():
user_abort() user_abort()
return answer == "ignore" return answer == "ignore"
def ask_for_manual_fixing(): def ask_for_manual_fixing():
"""Ask the user to resolve an issue manually.""" """Ask the user to resolve an issue manually."""
@ -42,6 +44,7 @@ def ask_for_manual_fixing():
if answer == "no": if answer == "no":
user_abort() user_abort()
def user_abort(): def user_abort():
"""Print abort and quit the program.""" """Print abort and quit the program."""

53
ubuntutools/sponsor_patch/source_package.py
View File

@ -32,16 +32,16 @@ from ubuntutools.sponsor_patch.question import (ask_for_ignoring_or_fixing,
ask_for_manual_fixing, ask_for_manual_fixing,
user_abort) user_abort)
def _get_series(launchpad): def _get_series(launchpad):
"""Returns a tuple with the development and list of supported series.""" """Returns a tuple with the development and list of supported series."""
#pylint: disable=E1101
ubuntu = launchpad.distributions['ubuntu'] ubuntu = launchpad.distributions['ubuntu']
#pylint: enable=E1101
devel_series = ubuntu.current_series.name devel_series = ubuntu.current_series.name
supported_series = [series.name for series in ubuntu.series supported_series = [series.name for series in ubuntu.series
if series.active and series.name != devel_series] if series.active and series.name != devel_series]
return (devel_series, supported_series) return (devel_series, supported_series)
def strip_epoch(version): def strip_epoch(version):
"""Removes the epoch from a Debian version string. """Removes the epoch from a Debian version string.
@ -55,6 +55,7 @@ def strip_epoch(version):
version_without_epoch = ':'.join(parts) version_without_epoch = ':'.join(parts)
return version_without_epoch return version_without_epoch
class SourcePackage(object): class SourcePackage(object):
"""This class represents a source package.""" """This class represents a source package."""
@ -134,8 +135,7 @@ class SourcePackage(object):
else: else:
target = upload target = upload
question = Question(["yes", "edit", "no"]) question = Question(["yes", "edit", "no"])
answer = question.ask("Do you want to upload the package to %s" % \ answer = question.ask("Do you want to upload the package to %s" % target, "no")
target, "no")
if answer == "edit": if answer == "edit":
return False return False
elif answer == "no": elif answer == "no":
@ -143,7 +143,7 @@ class SourcePackage(object):
cmd = ["dput", "--force", upload, self._changes_file] cmd = ["dput", "--force", upload, self._changes_file]
Logger.command(cmd) Logger.command(cmd)
if subprocess.call(cmd) != 0: if subprocess.call(cmd) != 0:
Logger.error("Upload of %s to %s failed." % \ Logger.error("Upload of %s to %s failed." %
(os.path.basename(self._changes_file), upload)) (os.path.basename(self._changes_file), upload))
sys.exit(1) sys.exit(1)
@ -175,8 +175,8 @@ class SourcePackage(object):
if dist is None: if dist is None:
dist = re.sub("-.*$", "", self._changelog.distributions) dist = re.sub("-.*$", "", self._changelog.distributions)
build_name = self._package + "_" + strip_epoch(self._version) + \ build_name = "{}_{}_{}.build".format(self._package, strip_epoch(self._version),
"_" + self._builder.get_architecture() + ".build" self._builder.get_architecture())
self._build_log = os.path.join(self._buildresult, build_name) self._build_log = os.path.join(self._buildresult, build_name)
successful_built = False successful_built = False
@ -195,8 +195,7 @@ class SourcePackage(object):
self._buildresult) self._buildresult)
if result != 0: if result != 0:
question = Question(["yes", "update", "retry", "no"]) question = Question(["yes", "update", "retry", "no"])
answer = question.ask("Do you want to resolve this issue " answer = question.ask("Do you want to resolve this issue manually", "yes")
"manually", "yes")
if answer == "yes": if answer == "yes":
break break
elif answer == "update": elif answer == "update":
@ -237,7 +236,7 @@ class SourcePackage(object):
cmd.append("-sd") cmd.append("-sd")
else: else:
cmd.append("-sa") cmd.append("-sa")
if not keyid is None: if keyid is not None:
cmd += ["-k" + keyid] cmd += ["-k" + keyid]
env = os.environ env = os.environ
if upload == 'ubuntu': if upload == 'ubuntu':
@ -253,9 +252,8 @@ class SourcePackage(object):
@property @property
def _changes_file(self): def _changes_file(self):
"""Returns the file name of the .changes file.""" """Returns the file name of the .changes file."""
return os.path.join(self._workdir, self._package + "_" + return os.path.join(self._workdir, "{}_{}_source.changes"
strip_epoch(self._version) + .format(self._package, strip_epoch(self._version)))
"_source.changes")
def check_target(self, upload, launchpad): def check_target(self, upload, launchpad):
"""Make sure that the target is correct. """Make sure that the target is correct.
@ -271,16 +269,14 @@ class SourcePackage(object):
[s + "-proposed" for s in supported_series] + \ [s + "-proposed" for s in supported_series] + \
[devel_series] [devel_series]
if self._changelog.distributions not in allowed: if self._changelog.distributions not in allowed:
Logger.error(("%s is not an allowed series. It needs to be one " Logger.error("%s is not an allowed series. It needs to be one of %s." %
"of %s.") % (self._changelog.distributions, (self._changelog.distributions, ", ".join(allowed)))
", ".join(allowed)))
return ask_for_ignoring_or_fixing() return ask_for_ignoring_or_fixing()
elif upload and upload.startswith("ppa/"): elif upload and upload.startswith("ppa/"):
allowed = supported_series + [devel_series] allowed = supported_series + [devel_series]
if self._changelog.distributions not in allowed: if self._changelog.distributions not in allowed:
Logger.error(("%s is not an allowed series. It needs to be one " Logger.error("%s is not an allowed series. It needs to be one of %s." %
"of %s.") % (self._changelog.distributions, (self._changelog.distributions, ", ".join(allowed)))
", ".join(allowed)))
return ask_for_ignoring_or_fixing() return ask_for_ignoring_or_fixing()
return True return True
@ -303,8 +299,7 @@ class SourcePackage(object):
if not task.title_contains(self._version): if not task.title_contains(self._version):
print("Bug #%i title: %s" % (bug_number, task.get_bug_title())) print("Bug #%i title: %s" % (bug_number, task.get_bug_title()))
msg = "Is %s %s the version that should be synced" % (self._package, msg = "Is %s %s the version that should be synced" % (self._package, self._version)
self._version)
answer = YesNoQuestion().ask(msg, "no") answer = YesNoQuestion().ask(msg, "no")
if answer == "no": if answer == "no":
user_abort() user_abort()
@ -312,15 +307,14 @@ class SourcePackage(object):
@property @property
def _debdiff_filename(self): def _debdiff_filename(self):
"""Returns the file name of the .debdiff file.""" """Returns the file name of the .debdiff file."""
debdiff_name = self._package + "_" + strip_epoch(self._version) + \ debdiff_name = "{}_{}.debdiff".format(self._package, strip_epoch(self._version))
".debdiff"
return os.path.join(self._workdir, debdiff_name) return os.path.join(self._workdir, debdiff_name)
@property @property
def _dsc_file(self): def _dsc_file(self):
"""Returns the file name of the .dsc file.""" """Returns the file name of the .dsc file."""
return os.path.join(self._workdir, self._package + "_" + return os.path.join(self._workdir, "{}_{}.dsc".format(self._package,
strip_epoch(self._version) + ".dsc") strip_epoch(self._version)))
def generate_debdiff(self, dsc_file): def generate_debdiff(self, dsc_file):
"""Generates a debdiff between the given .dsc file and this source """Generates a debdiff between the given .dsc file and this source
@ -348,8 +342,7 @@ class SourcePackage(object):
change something. change something.
""" """
assert os.path.isfile(self._changes_file), "%s does not exist." % \ assert os.path.isfile(self._changes_file), "%s does not exist." % (self._changes_file)
(self._changes_file)
changes = debian.deb822.Changes(open(self._changes_file)) changes = debian.deb822.Changes(open(self._changes_file))
fixed_bugs = [] fixed_bugs = []
if "Launchpad-Bugs-Fixed" in changes: if "Launchpad-Bugs-Fixed" in changes:
@ -362,8 +355,7 @@ class SourcePackage(object):
lp_bug = lp_bug.duplicate_of lp_bug = lp_bug.duplicate_of
if lp_bug.id not in fixed_bugs: if lp_bug.id not in fixed_bugs:
Logger.error("Launchpad bug #%i is not closed by new version." % \ Logger.error("Launchpad bug #%i is not closed by new version." % (lp_bug.id))
(lp_bug.id))
return ask_for_ignoring_or_fixing() return ask_for_ignoring_or_fixing()
return True return True
@ -378,7 +370,6 @@ class SourcePackage(object):
if self._build_log: if self._build_log:
print("file://" + self._build_log) print("file://" + self._build_log)
def reload_changelog(self): def reload_changelog(self):
"""Reloads debian/changelog and updates the version. """Reloads debian/changelog and updates the version.
@ -400,7 +391,7 @@ class SourcePackage(object):
try: try:
self._version = self._changelog.get_version() self._version = self._changelog.get_version()
except IndexError: except IndexError:
Logger.error("Debian package version could not be determined. " \ Logger.error("Debian package version could not be determined. "
"debian/changelog is probably malformed.") "debian/changelog is probably malformed.")
ask_for_manual_fixing() ask_for_manual_fixing()
return False return False

30
ubuntutools/sponsor_patch/sponsor_patch.py
View File

@ -75,6 +75,7 @@ def get_source_package_name(bug_task):
package = bug_task.bug_target_name.split(" ")[0] package = bug_task.bug_target_name.split(" ")[0]
return package return package
def get_user_shell(): def get_user_shell():
try: try:
shell = os.environ["SHELL"] shell = os.environ["SHELL"]
@ -82,6 +83,7 @@ def get_user_shell():
shell = pwd.getpwuid(os.getuid())[6] shell = pwd.getpwuid(os.getuid())[6]
return shell return shell
def edit_source(): def edit_source():
# Spawn shell to allow modifications # Spawn shell to allow modifications
cmd = [get_user_shell()] cmd = [get_user_shell()]
@ -96,6 +98,7 @@ process, exit the shell such that it returns an exit code other than zero.
Logger.error("Shell exited with exit value %i." % (returncode)) Logger.error("Shell exited with exit value %i." % (returncode))
sys.exit(1) sys.exit(1)
def ask_for_patch_or_branch(bug, attached_patches, linked_branches): def ask_for_patch_or_branch(bug, attached_patches, linked_branches):
patch = None patch = None
branch = None branch = None
@ -130,6 +133,7 @@ def ask_for_patch_or_branch(bug, attached_patches, linked_branches):
patch = Patch(attached_patches[selected - len(linked_branches) - 1]) patch = Patch(attached_patches[selected - len(linked_branches) - 1])
return (patch, branch) return (patch, branch)
def get_patch_or_branch(bug): def get_patch_or_branch(bug):
patch = None patch = None
branch = None branch = None
@ -155,6 +159,7 @@ def get_patch_or_branch(bug):
linked_branches) linked_branches)
return (patch, branch) return (patch, branch)
def download_branch(branch): def download_branch(branch):
dir_name = os.path.basename(branch) dir_name = os.path.basename(branch)
if os.path.isdir(dir_name): if os.path.isdir(dir_name):
@ -166,6 +171,7 @@ def download_branch(branch):
sys.exit(1) sys.exit(1)
return dir_name return dir_name
def merge_branch(branch): def merge_branch(branch):
edit = False edit = False
cmd = ["bzr", "merge", branch] cmd = ["bzr", "merge", branch]
@ -176,6 +182,7 @@ def merge_branch(branch):
edit = True edit = True
return edit return edit
def extract_source(dsc_file, verbose=False): def extract_source(dsc_file, verbose=False):
cmd = ["dpkg-source", "--no-preparation", "-x", dsc_file] cmd = ["dpkg-source", "--no-preparation", "-x", dsc_file]
if not verbose: if not verbose:
@ -185,6 +192,7 @@ def extract_source(dsc_file, verbose=False):
Logger.error("Extraction of %s failed." % (os.path.basename(dsc_file))) Logger.error("Extraction of %s failed." % (os.path.basename(dsc_file)))
sys.exit(1) sys.exit(1)
def get_open_ubuntu_bug_task(launchpad, bug, branch=None): def get_open_ubuntu_bug_task(launchpad, bug, branch=None):
"""Returns an open Ubuntu bug task for a given Launchpad bug. """Returns an open Ubuntu bug task for a given Launchpad bug.
@ -207,12 +215,11 @@ def get_open_ubuntu_bug_task(launchpad, bug, branch=None):
elif len(ubuntu_tasks) == 1: elif len(ubuntu_tasks) == 1:
task = ubuntu_tasks[0] task = ubuntu_tasks[0]
if len(ubuntu_tasks) > 1 and branch and branch[1] == 'ubuntu': if len(ubuntu_tasks) > 1 and branch and branch[1] == 'ubuntu':
tasks = [task for task in ubuntu_tasks tasks = [t for t in ubuntu_tasks if
if task.get_series() == branch[2] t.get_series() == branch[2] and t.package == branch[3]]
and task.package == branch[3]]
if len(tasks) > 1: if len(tasks) > 1:
# A bug targeted to the development series? # A bug targeted to the development series?
tasks = [task for task in tasks if task.series is not None] tasks = [t for t in tasks if t.series is not None]
assert len(tasks) == 1 assert len(tasks) == 1
task = tasks[0] task = tasks[0]
elif len(ubuntu_tasks) > 1: elif len(ubuntu_tasks) > 1:
@ -223,8 +230,8 @@ def get_open_ubuntu_bug_task(launchpad, bug, branch=None):
if len(open_ubuntu_tasks) == 1: if len(open_ubuntu_tasks) == 1:
task = open_ubuntu_tasks[0] task = open_ubuntu_tasks[0]
else: else:
Logger.normal("https://launchpad.net/bugs/%i has %i Ubuntu tasks:" \ Logger.normal("https://launchpad.net/bugs/%i has %i Ubuntu tasks:" %
% (bug_id, len(ubuntu_tasks))) (bug_id, len(ubuntu_tasks)))
for i in range(len(ubuntu_tasks)): for i in range(len(ubuntu_tasks)):
print("%i) %s" % (i + 1, print("%i) %s" % (i + 1,
ubuntu_tasks[i].get_package_and_series())) ubuntu_tasks[i].get_package_and_series()))
@ -234,6 +241,7 @@ def get_open_ubuntu_bug_task(launchpad, bug, branch=None):
Logger.info("Selected Ubuntu task: %s" % (task.get_short_info())) Logger.info("Selected Ubuntu task: %s" % (task.get_short_info()))
return task return task
def _create_and_change_into(workdir): def _create_and_change_into(workdir):
"""Create (if it does not exits) and change into given working directory.""" """Create (if it does not exits) and change into given working directory."""
@ -241,13 +249,14 @@ def _create_and_change_into(workdir):
try: try:
os.makedirs(workdir) os.makedirs(workdir)
except os.error as error: except os.error as error:
Logger.error("Failed to create the working directory %s [Errno " \ Logger.error("Failed to create the working directory %s [Errno %i]: %s." %
"%i]: %s." % (workdir, error.errno, error.strerror)) (workdir, error.errno, error.strerror))
sys.exit(1) sys.exit(1)
if workdir != os.getcwd(): if workdir != os.getcwd():
Logger.command(["cd", workdir]) Logger.command(["cd", workdir])
os.chdir(workdir) os.chdir(workdir)
def _update_maintainer_field(): def _update_maintainer_field():
"""Update the Maintainer field in debian/control.""" """Update the Maintainer field in debian/control."""
Logger.command(["update-maintainer"]) Logger.command(["update-maintainer"])
@ -257,6 +266,7 @@ def _update_maintainer_field():
Logger.error("update-maintainer failed: %s", str(e)) Logger.error("update-maintainer failed: %s", str(e))
sys.exit(1) sys.exit(1)
def _update_timestamp(): def _update_timestamp():
"""Run dch to update the timestamp of debian/changelog.""" """Run dch to update the timestamp of debian/changelog."""
cmd = ["dch", "--maintmaint", "--release", ""] cmd = ["dch", "--maintmaint", "--release", ""]
@ -264,6 +274,7 @@ def _update_timestamp():
if subprocess.call(cmd) != 0: if subprocess.call(cmd) != 0:
Logger.info("Failed to update timestamp in debian/changelog.") Logger.info("Failed to update timestamp in debian/changelog.")
def _download_and_change_into(task, dsc_file, patch, branch): def _download_and_change_into(task, dsc_file, patch, branch):
"""Downloads the patch and branch and changes into the source directory.""" """Downloads the patch and branch and changes into the source directory."""
@ -290,15 +301,14 @@ def _download_and_change_into(task, dsc_file, patch, branch):
Logger.command(["cd", directory]) Logger.command(["cd", directory])
os.chdir(directory) os.chdir(directory)
def sponsor_patch(bug_number, build, builder, edit, keyid, lpinstance, update, def sponsor_patch(bug_number, build, builder, edit, keyid, lpinstance, update,
upload, workdir): upload, workdir):
workdir = os.path.realpath(os.path.expanduser(workdir)) workdir = os.path.realpath(os.path.expanduser(workdir))
_create_and_change_into(workdir) _create_and_change_into(workdir)
launchpad = Launchpad.login_with("sponsor-patch", lpinstance) launchpad = Launchpad.login_with("sponsor-patch", lpinstance)
#pylint: disable=E1101
bug = launchpad.bugs[bug_number] bug = launchpad.bugs[bug_number]
#pylint: enable=E1101
(patch, branch) = get_patch_or_branch(bug) (patch, branch) = get_patch_or_branch(bug)
task = get_open_ubuntu_bug_task(launchpad, bug, branch) task = get_open_ubuntu_bug_task(launchpad, bug, branch)

4
ubuntutools/subprocess.py
View File

@ -26,10 +26,10 @@ class Popen(subprocess.Popen):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
kwargs.setdefault('close_fds', True) kwargs.setdefault('close_fds', True)
if ('restore_signals' not in if 'restore_signals' not in inspect.getargspec(subprocess.Popen.__init__)[0]:
inspect.getargspec(subprocess.Popen.__init__)[0]):
given_preexec_fn = kwargs.pop('preexec_fn', None) given_preexec_fn = kwargs.pop('preexec_fn', None)
restore_signals = kwargs.pop('restore_signals', True) restore_signals = kwargs.pop('restore_signals', True)
def preexec_fn(): def preexec_fn():
if restore_signals: if restore_signals:
for sig in ('SIGPIPE', 'SIGXFZ', 'SIGXFSZ'): for sig in ('SIGPIPE', 'SIGXFZ', 'SIGXFSZ'):

1
ubuntutools/test/__init__.py
View File

@ -22,6 +22,7 @@ if sys.version_info < (2, 7):
else: else:
import unittest import unittest
def discover(): def discover():
# import __main__ triggers code re-execution # import __main__ triggers code re-execution
__main__ = sys.modules['__main__'] __main__ = sys.modules['__main__']

1
ubuntutools/test/example_package.py
View File

@ -20,6 +20,7 @@ import subprocess
import debian.debian_support import debian.debian_support
class ExamplePackage(object): class ExamplePackage(object):
def __init__(self, source='example', version='1.0-1'): def __init__(self, source='example', version='1.0-1'):
self.source = source self.source = source

35
ubuntutools/test/test_archive.py
View File

@ -15,33 +15,23 @@
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
try:
import builtins
except ImportError:
import __builtin__
import os.path import os.path
import shutil import shutil
try: import sys
from StringIO import StringIO
except:
from io import StringIO
from io import BytesIO
import tempfile import tempfile
import types from io import BytesIO
try: try:
from urllib.request import OpenerDirector, urlopen from urllib.request import OpenerDirector, urlopen
from urllib.error import HTTPError, URLError from urllib.error import HTTPError, URLError
except ImportError: except ImportError:
from urllib2 import OpenerDirector, urlopen from urllib2 import OpenerDirector, urlopen
from urllib2 import HTTPError, URLError from urllib2 import HTTPError, URLError
import debian.deb822
import httplib2 import httplib2
import sys
import mock import mock
import debian.deb822
import ubuntutools.archive import ubuntutools.archive
from ubuntutools.config import UDTConfig
from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest
from ubuntutools.test.example_package import ExamplePackage from ubuntutools.test.example_package import ExamplePackage
@ -215,10 +205,6 @@ class LocalSourcePackageTestCase(unittest.TestCase):
pkg.pull() pkg.pull()
def test_pull(self): def test_pull(self):
dist = self.SourcePackage.distribution
mirror = UDTConfig.defaults['%s_MIRROR' % dist.upper()]
urlbase = '/pool/main/e/example/'
pkg = self.SourcePackage('example', '1.0-1', 'main', pkg = self.SourcePackage('example', '1.0-1', 'main',
workdir=self.workdir) workdir=self.workdir)
@ -227,12 +213,10 @@ class LocalSourcePackageTestCase(unittest.TestCase):
pkg.pull() pkg.pull()
def test_mirrors(self): def test_mirrors(self):
master = UDTConfig.defaults['UBUNTU_MIRROR']
mirror = 'http://mirror' mirror = 'http://mirror'
lpbase = 'https://launchpad.net/ubuntu/+archive/primary/+files/'
urlbase = '/pool/main/e/example/'
sequence = [self.urlopen_null, self.urlopen_404, self.urlopen_proxy, sequence = [self.urlopen_null, self.urlopen_404, self.urlopen_proxy,
self.urlopen_proxy] self.urlopen_proxy]
def _callable_iter(*args, **kwargs): def _callable_iter(*args, **kwargs):
return sequence.pop(0)(*args, **kwargs) return sequence.pop(0)(*args, **kwargs)
url_opener = mock.MagicMock(spec=OpenerDirector) url_opener = mock.MagicMock(spec=OpenerDirector)
@ -256,12 +240,8 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
SourcePackage = ubuntutools.archive.DebianSourcePackage SourcePackage = ubuntutools.archive.DebianSourcePackage
def test_mirrors(self): def test_mirrors(self):
debian_master = UDTConfig.defaults['DEBIAN_MIRROR']
debsec_master = UDTConfig.defaults['DEBSEC_MIRROR']
debian_mirror = 'http://mirror/debian' debian_mirror = 'http://mirror/debian'
debsec_mirror = 'http://mirror/debsec' debsec_mirror = 'http://mirror/debsec'
lpbase = 'https://launchpad.net/debian/+archive/primary/+files/'
base = '/pool/main/e/example/'
sequence = [self.urlopen_null, sequence = [self.urlopen_null,
self.urlopen_404, self.urlopen_404,
@ -272,6 +252,7 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
b'{"fileinfo": {"hashabc": [{"name": "example_1.0.orig.tar.gz"}]}}'), b'{"fileinfo": {"hashabc": [{"name": "example_1.0.orig.tar.gz"}]}}'),
self.urlopen_file('example_1.0.orig.tar.gz'), self.urlopen_file('example_1.0.orig.tar.gz'),
self.urlopen_proxy] self.urlopen_proxy]
def _callable_iter(*args, **kwargs): def _callable_iter(*args, **kwargs):
return sequence.pop(0)(*args, **kwargs) return sequence.pop(0)(*args, **kwargs)
url_opener = mock.MagicMock(spec=OpenerDirector) url_opener = mock.MagicMock(spec=OpenerDirector)
@ -287,8 +268,6 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
def test_dsc_missing(self): def test_dsc_missing(self):
mirror = 'http://mirror' mirror = 'http://mirror'
lpbase = 'https://launchpad.net/debian/+archive/primary/+files/'
base = '/pool/main/e/example/'
self.mock_http.side_effect = self.request_404_then_proxy self.mock_http.side_effect = self.request_404_then_proxy
patcher = mock.patch.object(debian.deb822.GpgInfo, 'from_sequence') patcher = mock.patch.object(debian.deb822.GpgInfo, 'from_sequence')
@ -305,8 +284,6 @@ class DebianLocalSourcePackageTestCase(LocalSourcePackageTestCase):
def test_dsc_badsig(self): def test_dsc_badsig(self):
mirror = 'http://mirror' mirror = 'http://mirror'
lpbase = 'https://launchpad.net/debian/+archive/primary/+files/'
base = '/pool/main/e/example/'
self.mock_http.side_effect = self.request_404_then_proxy self.mock_http.side_effect = self.request_404_then_proxy
patcher = mock.patch.object(debian.deb822.GpgInfo, 'from_sequence') patcher = mock.patch.object(debian.deb822.GpgInfo, 'from_sequence')

8
ubuntutools/test/test_config.py
View File

@ -15,10 +15,6 @@
# OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR # OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE. # PERFORMANCE OF THIS SOFTWARE.
try:
import builtins
except ImportError:
import __builtin__
import os import os
import sys import sys
import locale import locale
@ -33,6 +29,7 @@ from ubuntutools.config import UDTConfig, ubu_email
from ubuntutools.logger import Logger from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest
class ConfigTestCase(unittest.TestCase): class ConfigTestCase(unittest.TestCase):
_config_files = { _config_files = {
'system': '', 'system': '',
@ -242,6 +239,7 @@ class UbuEmailTestCase(unittest.TestCase):
try: try:
os.environ['DEBFULLNAME'] = env_name os.environ['DEBFULLNAME'] = env_name
except UnicodeEncodeError: except UnicodeEncodeError:
raise unittest.SkipTest("python interpreter is not running in an unicode capable locale") raise unittest.SkipTest("python interpreter is not running in an "
"unicode capable locale")
os.environ['DEBEMAIL'] = email = 'joe@example.net' os.environ['DEBEMAIL'] = email = 'joe@example.net'
self.assertEqual(ubu_email(), (name, email)) self.assertEqual(ubu_email(), (name, email))

2
ubuntutools/test/test_help.py
View File

@ -26,6 +26,7 @@ from ubuntutools.test import unittest
TIMEOUT = 5 TIMEOUT = 5
def load_tests(loader, tests, pattern): def load_tests(loader, tests, pattern):
"Give HelpTestCase a chance to populate before loading its test cases" "Give HelpTestCase a chance to populate before loading its test cases"
suite = unittest.TestSuite() suite = unittest.TestSuite()
@ -33,6 +34,7 @@ def load_tests(loader, tests, pattern):
suite.addTests(loader.loadTestsFromTestCase(HelpTestCase)) suite.addTests(loader.loadTestsFromTestCase(HelpTestCase))
return suite return suite
class HelpTestCase(unittest.TestCase): class HelpTestCase(unittest.TestCase):
@classmethod @classmethod
def populate(cls): def populate(cls):

2
ubuntutools/test/test_pylint.py
View File

@ -25,7 +25,7 @@ from ubuntutools import subprocess
class PylintTestCase(unittest.TestCase): class PylintTestCase(unittest.TestCase):
def test_pylint(self): def test_pylint(self):
"Test: Run pylint on Python source code" "Test: Run pylint on Python source code"
files = ['ubuntutools'] files = ['ubuntutools', 'setup.py']
for script in setup.scripts: for script in setup.scripts:
with open(script, 'r') as script_file: with open(script, 'r') as script_file:
shebang = script_file.readline() shebang = script_file.readline()

79
ubuntutools/test/test_update_maintainer.py
View File

@ -16,13 +16,9 @@
"""Test suite for ubuntutools.update_maintainer""" """Test suite for ubuntutools.update_maintainer"""
try:
import builtins
except ImportError:
import __builtin__
try: try:
from StringIO import StringIO from StringIO import StringIO
except: except ImportError:
from io import StringIO from io import StringIO
import os import os
@ -34,7 +30,8 @@ from ubuntutools.logger import Logger
from ubuntutools.test import unittest from ubuntutools.test import unittest
from ubuntutools.update_maintainer import update_maintainer from ubuntutools.update_maintainer import update_maintainer
_LUCID_CHANGELOG = """axis2c (1.6.0-0ubuntu8) lucid; urgency=low _LUCID_CHANGELOG = """\
axis2c (1.6.0-0ubuntu8) lucid; urgency=low
* rebuild rest of main for armel armv7/thumb2 optimization; * rebuild rest of main for armel armv7/thumb2 optimization;
UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2 UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
@ -42,7 +39,8 @@ _LUCID_CHANGELOG = """axis2c (1.6.0-0ubuntu8) lucid; urgency=low
-- Alexander Sack <asac@ubuntu.com> Fri, 05 Mar 2010 03:10:28 +0100 -- Alexander Sack <asac@ubuntu.com> Fri, 05 Mar 2010 03:10:28 +0100
""" """
_AXIS2C_CONTROL = """Source: axis2c _AXIS2C_CONTROL = """\
Source: axis2c
Section: libs Section: libs
Priority: optional Priority: optional
DM-Upload-Allowed: yes DM-Upload-Allowed: yes
@ -56,7 +54,8 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
""" """
_AXIS2C_UPDATED = """Source: axis2c _AXIS2C_UPDATED = """\
Source: axis2c
Section: libs Section: libs
Priority: optional Priority: optional
DM-Upload-Allowed: yes DM-Upload-Allowed: yes
@ -70,14 +69,16 @@ Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
""" """
_UNSTABLE_CHANGELOG = """adblock-plus (1.3.3-1) unstable; urgency=low _UNSTABLE_CHANGELOG = """\
adblock-plus (1.3.3-1) unstable; urgency=low
* New upstream release. * New upstream release.
-- Benjamin Drung <bdrung@ubuntu.com> Sat, 25 Dec 2010 20:17:41 +0100 -- Benjamin Drung <bdrung@ubuntu.com> Sat, 25 Dec 2010 20:17:41 +0100
""" """
_ABP_CONTROL = """Source: adblock-plus _ABP_CONTROL = """\
Source: adblock-plus
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Dmitry E. Oboukhov <unera@debian.org> Maintainer: Dmitry E. Oboukhov <unera@debian.org>
@ -93,7 +94,8 @@ VCS-Git: git://git.debian.org/pkg-mozext/adblock-plus.git
Package: xul-ext-adblock-plus Package: xul-ext-adblock-plus
""" """
_ABP_UPDATED = """Source: adblock-plus _ABP_UPDATED = """\
Source: adblock-plus
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
@ -110,7 +112,8 @@ VCS-Git: git://git.debian.org/pkg-mozext/adblock-plus.git
Package: xul-ext-adblock-plus Package: xul-ext-adblock-plus
""" """
_ABP_OLD_MAINTAINER = """Source: adblock-plus _ABP_OLD_MAINTAINER = """\
Source: adblock-plus
Section: web Section: web
Priority: optional Priority: optional
Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com> Maintainer: Ubuntu MOTU Developers <ubuntu-motu@lists.ubuntu.com>
@ -127,37 +130,40 @@ VCS-Git: git://git.debian.org/pkg-mozext/adblock-plus.git
Package: xul-ext-adblock-plus Package: xul-ext-adblock-plus
""" """
_SIMPLE_RULES = """#!/usr/bin/make -f _SIMPLE_RULES = """\
#!/usr/bin/make -f
%: %:
dh $@ \tdh $@
""" """
_COMPLEX_RULES = """#!/usr/bin/make -f _COMPLEX_RULES = """\
#!/usr/bin/make -f
... from python2.6 ... ... from python2.6 ...
distribution := $(shell lsb_release -is) distribution := $(shell lsb_release -is)
control-file: control-file:
sed -e "s/@PVER@/$(PVER)/g" \ \tsed -e "s/@PVER@/$(PVER)/g" \\
-e "s/@VER@/$(VER)/g" \ \t\t-e "s/@VER@/$(VER)/g" \\
-e "s/@PYSTDDEP@/$(PYSTDDEP)/g" \ \t\t-e "s/@PYSTDDEP@/$(PYSTDDEP)/g" \\
-e "s/@PRIO@/$(PY_PRIO)/g" \ \t\t-e "s/@PRIO@/$(PY_PRIO)/g" \\
-e "s/@MINPRIO@/$(PY_MINPRIO)/g" \ \t\t-e "s/@MINPRIO@/$(PY_MINPRIO)/g" \\
debian/control.in > debian/control.tmp \t\tdebian/control.in > debian/control.tmp
ifeq ($(distribution),Ubuntu) ifeq ($(distribution),Ubuntu)
ifneq (,$(findstring ubuntu, $(PKGVERSION))) ifneq (,$(findstring ubuntu, $(PKGVERSION)))
m='Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>'; \ \tm='Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>'; \\
sed -i "/^Maintainer:/s/\(.*\)/Maintainer: $$m\nXSBC-Original-\1/" \ \t\tsed -i "/^Maintainer:/s/\\(.*\\)/Maintainer: $$m\nXSBC-Original-\1/" \\
debian/control.tmp \t\tdebian/control.tmp
endif endif
endif endif
[ -e debian/control ] \ \t[ -e debian/control ] \\
&& cmp -s debian/control debian/control.tmp \ \t\t&& cmp -s debian/control debian/control.tmp \\
&& rm -f debian/control.tmp && exit 0; \ \t\t&& rm -f debian/control.tmp && exit 0; \\
mv debian/control.tmp debian/control \t\tmv debian/control.tmp debian/control
... from python2.6 ... ... from python2.6 ...
""" """
_SEAHORSE_PLUGINS_CONTROL = """# This file is autogenerated. DO NOT EDIT! _SEAHORSE_PLUGINS_CONTROL = """\
# This file is autogenerated. DO NOT EDIT!
# #
# Modifications should be made to debian/control.in instead. # Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target. # This file is regenerated automatically in the clean target.
@ -174,7 +180,8 @@ Homepage: http://live.gnome.org/Seahorse
Package: seahorse-plugins Package: seahorse-plugins
""" """
_SEAHORSE_PLUGINS_UPDATED = """# This file is autogenerated. DO NOT EDIT! _SEAHORSE_PLUGINS_UPDATED = """\
# This file is autogenerated. DO NOT EDIT!
# #
# Modifications should be made to debian/control.in instead. # Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target. # This file is regenerated automatically in the clean target.
@ -192,7 +199,8 @@ Homepage: http://live.gnome.org/Seahorse
Package: seahorse-plugins Package: seahorse-plugins
""" """
#pylint: disable=R0904
# pylint: disable=R0904
class UpdateMaintainerTestCase(unittest.TestCase): class UpdateMaintainerTestCase(unittest.TestCase):
"""TestCase object for ubuntutools.update_maintainer""" """TestCase object for ubuntutools.update_maintainer"""
@ -221,7 +229,7 @@ class UpdateMaintainerTestCase(unittest.TestCase):
self._files[base].close = lambda: None self._files[base].close = lambda: None
return self._files[base] return self._files[base]
#pylint: disable=C0103 # pylint: disable=C0103
def setUp(self): def setUp(self):
if sys.version_info[0] < 3: if sys.version_info[0] < 3:
self.assertRegex = self.assertRegexpMatches self.assertRegex = self.assertRegexpMatches
@ -252,7 +260,7 @@ class UpdateMaintainerTestCase(unittest.TestCase):
Logger.stdout = sys.stdout Logger.stdout = sys.stdout
Logger.stderr = sys.stderr Logger.stderr = sys.stderr
#pylint: enable=C0103 # pylint: enable=C0103
def test_debian_package(self): def test_debian_package(self):
"""Test: Don't update Maintainer field if target is Debian.""" """Test: Don't update Maintainer field if target is Debian."""
self._files["changelog"] = StringIO(_UNSTABLE_CHANGELOG) self._files["changelog"] = StringIO(_UNSTABLE_CHANGELOG)
@ -272,9 +280,8 @@ class UpdateMaintainerTestCase(unittest.TestCase):
warnings = Logger.stderr.getvalue().strip() warnings = Logger.stderr.getvalue().strip()
Logger.stderr = StringIO() Logger.stderr = StringIO()
self.assertEqual(len(warnings.splitlines()), 1) self.assertEqual(len(warnings.splitlines()), 1)
self.assertRegex(warnings, "Warning: Overwriting original " self.assertRegex(warnings, "Warning: Overwriting original maintainer: "
"maintainer: Soren Hansen " "Soren Hansen <soren@ubuntu.com>")
"<soren@ubuntu.com>")
def test_update_maintainer(self): def test_update_maintainer(self):
"""Test: Update Maintainer field.""" """Test: Update Maintainer field."""

3
ubuntutools/update_maintainer.py
View File

@ -169,8 +169,7 @@ def update_maintainer(debian_directory, verbose=False):
if original_maintainer.strip().endswith("ubuntu.com>"): if original_maintainer.strip().endswith("ubuntu.com>"):
if verbose: if verbose:
print ("The Maintainer email is set to an ubuntu.com address. " print("The Maintainer email is set to an ubuntu.com address. Doing nothing.")
"Doing nothing.")
continue continue
if distribution in ("stable", "testing", "unstable", "experimental"): if distribution in ("stable", "testing", "unstable", "experimental"):

1
update-maintainer
View File

@ -53,5 +53,6 @@ def main():
except MaintainerUpdateException: except MaintainerUpdateException:
sys.exit(1) sys.exit(1)
if __name__ == "__main__": if __name__ == "__main__":
main() main()