particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge commit 'origin'

Browse source
This commit is contained in:
Mike McLean 2008-05-30 14:49:13 -04:00
commit e5b44a0d46
7 changed files with 175 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

30
cli/koji
View file

@ -1,7 +1,7 @@
#!/usr/bin/python
# command line interface for the Koji build system
# Copyright (c) 2005-2007 Red Hat
# Copyright (c) 2005-2008 Red Hat
#
# Koji is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -97,6 +97,8 @@ def get_options():
help=_("show debug output"))
parser.add_option("--debug-xmlrpc", action="store_true", default=False,
help=_("show xmlrpc debug output"))
parser.add_option("-q", "--quiet", action="store_true", default=False,
help=_("run quietly"))
parser.add_option("--skip-main", action="store_true", default=False,
help=_("don't actually run main"))
parser.add_option("-s", "--server", help=_("url of XMLRPC server"))
@ -143,14 +145,15 @@ def get_options():
}
# grab settings from /etc/koji.conf first, and allow them to be
# overridden by user config
progname = os.path.basename(sys.argv[0]) or 'koji'
for configFile in ('/etc/koji.conf', os.path.expanduser(options.configFile)):
if os.access(configFile, os.F_OK):
f = open(configFile)
config = ConfigParser.ConfigParser()
config.readfp(f)
f.close()
if config.has_section('koji'):
for name, value in config.items('koji'):
if config.has_section(progname):
for name, value in config.items(progname):
#note the defaults dictionary also serves to indicate which
#options *can* be set via the config file. Such options should
#not have a default value set in the option parser.
@ -1677,7 +1680,7 @@ def anon_handle_latest_pkg(options, session, args):
parser = OptionParser(usage=usage)
parser.add_option("--arch", help=_("List all of the latest packages for this arch"))
parser.add_option("--all", action="store_true", help=_("List all of the latest packages for this tag"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"), default=options.quiet)
parser.add_option("--paths", action="store_true", help=_("Show the file paths"))
(options, args) = parser.parse_args(args)
if len(args) == 0:
@ -1733,7 +1736,7 @@ def anon_handle_latest_by_tag(options, session, args):
usage = _("usage: %prog latest-by-tag [options] package [package...]")
usage += _("\n(Specify the --help global option for a list of other help options)")
parser = OptionParser(usage=usage)
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"), default=options.quiet)
parser.add_option("--paths", action="store_true", help=_("Show the file paths"))
(options, args) = parser.parse_args(args)
if len(args) == 0:
@ -1802,7 +1805,7 @@ def anon_handle_list_tagged(options, session, args):
parser.add_option("--rpms", action="store_true", help=_("Show rpms instead of builds"))
parser.add_option("--inherit", action="store_true", help=_("Follow inheritance"))
parser.add_option("--latest", action="store_true", help=_("Only show the latest builds/rpms"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"), default=options.quiet)
parser.add_option("--paths", action="store_true", help=_("Show the file paths"))
parser.add_option("--sigs", action="store_true", help=_("Show signatures"))
(options, args) = parser.parse_args(args)
@ -1837,7 +1840,6 @@ def anon_handle_list_tagged(options, session, args):
build_idx = dict([(b['id'],b) for b in builds])
for rinfo in data:
build = build_idx[rinfo['build_id']]
build['name'] = build['package_name']
builddir = pathinfo.build(build)
if options.sigs:
sigkey = rinfo['sigkey']
@ -2085,7 +2087,7 @@ def anon_handle_list_hosts(options, session, args):
parser.add_option("--not-ready", action="store_false", dest="ready", help=_("Limit to not ready hosts"))
parser.add_option("--enabled", action="store_true", help=_("Limit to enabled hosts"))
parser.add_option("--not-enabled", action="store_false", dest="enabled", help=_("Limit to not enabled hosts"))
parser.add_option("--quiet", action="store_true", help=_("Do not print header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print header information"), default=options.quiet)
(options, args) = parser.parse_args(args)
opts = {}
activate_session(session)
@ -2137,7 +2139,7 @@ def anon_handle_list_pkgs(options, session, args):
parser.add_option("--owner", help=_("Specify owner"))
parser.add_option("--tag", help=_("Specify tag"))
parser.add_option("--package", help=_("Specify package"))
parser.add_option("--quiet", action="store_true", help=_("Do not print header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print header information"), default=options.quiet)
parser.add_option("--noinherit", action="store_true", help=_("Don't follow inheritance"))
parser.add_option("--show-blocked", action="store_true", help=_("Show blocked packages"))
parser.add_option("--show-dups", action="store_true", help=_("Show superseded owners"))
@ -2637,7 +2639,7 @@ def anon_handle_list_targets(options, session, args):
usage += _("\n(Specify the --help global option for a list of other help options)")
parser = OptionParser(usage=usage)
parser.add_option("--name", help=_("Specify the build target name"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"))
parser.add_option("--quiet", action="store_true", help=_("Do not print the header information"), default=options.quiet)
(options, args) = parser.parse_args(args)
if len(args) != 0:
parser.error(_("This command takes no arguments"))
@ -3505,7 +3507,7 @@ def handle_list_tasks(options, session, args):
usage += _("\n(Specify the --help global option for a list of other help options)")
parser = OptionParser(usage=usage)
parser.add_option("--mine", action="store_true", help=_("Just print your tasks"))
parser.add_option("--quiet", action="store_true", help=_("Do not display the column headers"))
parser.add_option("--quiet", action="store_true", help=_("Do not display the column headers"), default=options.quiet)
(options, args) = parser.parse_args(args)
if len(args) != 0:
parser.error(_("This command takes no arguments"))
@ -3789,7 +3791,8 @@ def anon_handle_download_build(options, session, args):
parser.add_option("--latestfrom", dest="latestfrom", help=_("Download the latest build from this tag"))
parser.add_option("--debuginfo", action="store_true", help=_("Also download -debuginfo rpms"))
parser.add_option("--key", help=_("Download rpms signed with the given key"))
parser.add_option("-q", "--quiet", action="store_true", help=_("Do not display progress meter"))
parser.add_option("-q", "--quiet", action="store_true", help=_("Do not display progress meter"),
default=options.quiet)
(suboptions, args) = parser.parse_args(args)
if len(args) < 1:
parser.error(_("Please specify a package N-V-R or build ID"))
@ -3958,7 +3961,8 @@ def list_commands(show_admin=False):
desc = desc[8:]
print " %-20s %s" % (alias, desc)
print _('(Type "koji --help" for help about global options')
print _(' or "koji <command> --help" for help about a particular command\'s options.)')
print _(' or "koji <command> --help" for help about a particular command\'s options')
print _(' or "koji help --admin" for help about privileged administrative commands.)')
def error(msg=None, code=1):
if msg: