From f6cb12747951741c1ad4d3e118870afd5991b396 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Mon, 27 Dec 2010 20:32:07 +0100 Subject: [PATCH] backportpackage: Make pylint happier. --- 404main | 6 +- backportpackage | 146 +++++++++++++++++++++++++----------------------- 2 files changed, 80 insertions(+), 72 deletions(-) diff --git a/404main b/404main index 11946a4..152c975 100755 --- a/404main +++ b/404main @@ -96,7 +96,7 @@ def find_main(cache, pack): break if got_src: # pylint: disable=E1101 - for deptype, all_deps in src_records.build_depends.iteritems(): + for _, all_deps in src_records.build_depends.iteritems(): # pylint: enable=E1101 for or_deps in all_deps: base_deps = [] @@ -107,9 +107,9 @@ def find_main(cache, pack): process_deps(cache, deps) -def usage(exit): +def usage(exit_code): print 'Usage: %s []' % sys.argv[0] - sys.exit(exit) + sys.exit(exit_code) def main(): diff --git a/backportpackage b/backportpackage index dd04e18..716883c 100755 --- a/backportpackage +++ b/backportpackage @@ -48,76 +48,84 @@ def check_call(cmd, *args, **kwargs): def parse(args): usage = 'Usage: %prog [options] ' - p = optparse.OptionParser(usage) - p.add_option('-d', '--destination', - dest='dest_releases', - default=[], - action='append', - help='Backport to DEST release (default: current release)', - metavar='DEST') - p.add_option('-s', '--source', - dest='source_release', - default=None, - help='Backport from SOURCE release (default: devel release)', - metavar='SOURCE') - p.add_option('-S', '--suffix', - dest='suffix', - default=None, - help='Suffix to append to version number (default: ~ppa1)', - metavar='SUFFIX') - p.add_option('-b', '--build', - dest='build', - default=False, - action='store_true', - help='Build the package before uploading (default: %default)') - p.add_option('-B', '--builder', - dest='builder', - default=None, - help='Specify the package builder (default: pbuilder)', - metavar='BUILDER') - p.add_option('-U', '--update', - dest='update', - default=False, - action='store_true', - help='Update the build environment before attempting to build') - p.add_option('-u', '--upload', - dest='upload', - help='Specify an upload destination', - metavar='UPLOAD') - p.add_option('-y', '--yes', - dest='prompt', - default=True, - action='store_false', - help='Do not prompt before uploading to a PPA') - p.add_option('-v', '--version', - dest='version', - default=None, - help='Package version to backport (or verify)', - metavar='VERSION') - p.add_option('-w', '--workdir', - dest='workdir', - default=None, - help='Specify a working directory (default: temporary dir)', - metavar='WORKDIR') - p.add_option('-m', '--mirror', - dest='ubuntu_mirror', - default=None, - help='Preferred Ubuntu mirror (default: Launchpad)', - metavar='INSTANCE') - p.add_option('-l', '--lpinstance', - dest='lpinstance', - default=None, - help='Launchpad instance to connect to (default: production)', - metavar='INSTANCE') - p.add_option('--no-conf', - dest='no_conf', - default=False, - help="Don't read config files or environment variables", - action='store_true') + parser = optparse.OptionParser(usage) + parser.add_option('-d', '--destination', + dest='dest_releases', + default=[], + action='append', + help='Backport to DEST release ' + '(default: current release)', + metavar='DEST') + parser.add_option('-s', '--source', + dest='source_release', + default=None, + help='Backport from SOURCE release ' + '(default: devel release)', + metavar='SOURCE') + parser.add_option('-S', '--suffix', + dest='suffix', + default=None, + help='Suffix to append to version number ' + '(default: ~ppa1)', + metavar='SUFFIX') + parser.add_option('-b', '--build', + dest='build', + default=False, + action='store_true', + help='Build the package before uploading ' + '(default: %default)') + parser.add_option('-B', '--builder', + dest='builder', + default=None, + help='Specify the package builder (default: pbuilder)', + metavar='BUILDER') + parser.add_option('-U', '--update', + dest='update', + default=False, + action='store_true', + help='Update the build environment before ' + 'attempting to build') + parser.add_option('-u', '--upload', + dest='upload', + help='Specify an upload destination', + metavar='UPLOAD') + parser.add_option('-y', '--yes', + dest='prompt', + default=True, + action='store_false', + help='Do not prompt before uploading to a PPA') + parser.add_option('-v', '--version', + dest='version', + default=None, + help='Package version to backport (or verify)', + metavar='VERSION') + parser.add_option('-w', '--workdir', + dest='workdir', + default=None, + help='Specify a working directory ' + '(default: temporary dir)', + metavar='WORKDIR') + parser.add_option('-m', '--mirror', + dest='ubuntu_mirror', + default=None, + help='Preferred Ubuntu mirror (default: Launchpad)', + metavar='INSTANCE') + parser.add_option('-l', '--lpinstance', + dest='lpinstance', + default=None, + help='Launchpad instance to connect to ' + '(default: production)', + metavar='INSTANCE') + parser.add_option('--no-conf', + dest='no_conf', + default=False, + help="Don't read config files or environment variables", + action='store_true') - opts, args = p.parse_args(args) + opts, args = parser.parse_args(args) if len(args) != 1: - p.error('You must specify a single source package or a .dsc URL/path.') + parser.error('You must specify a single source package or a .dsc ' + 'URL/path.') config = UDTConfig(opts.no_conf) if opts.builder is None: opts.builder = config.get_value('BUILDER') @@ -130,7 +138,7 @@ def parse(args): if opts.ubuntu_mirror is None: opts.ubuntu_mirror = config.get_value('UBUNTU_MIRROR') if not opts.upload and not opts.workdir: - p.error('Please specify either a working dir or an upload target!') + parser.error('Please specify either a working dir or an upload target!') return opts, args