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

- let OptionParser handle line-wrapping

Browse source 
- standardize whitespace and punctuation
This commit is contained in:
Mike Bonnet 2010-07-06 16:26:28 -04:00
parent a7a01e7894
commit 5824420959
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

46
cli/koji
View file

@ -4179,18 +4179,18 @@ def handle_spin_livecd(options, session, args):
parser.add_option("--ksversion", metavar="VERSION",
help=_("The syntax version used in the kickstart file"))
parser.add_option("--scratch", action="store_true",
help=_("Create a scratch LiveCD image."))
help=_("Create a scratch LiveCD image"))
parser.add_option("--repo",
help=_("Specify a comma-separated list of repos that will override\n" +
"the repo used to install RPMs in the LiveCD image. The \n" +
help=_("Specify a comma-separated list of repos that will override " +
"the repo used to install RPMs in the LiveCD image. The " +
"build tag repo associated with the target is the default."))
(task_options, args) = parser.parse_args(args)
# Make sure the target and kickstart is specified.
if len(args) != 3:
parser.error(_("Three arguments are required: an architecture, " +
"a build target, and a relative \npath to a " +
"kickstart file ."))
"a build target, and a relative path to a " +
"kickstart file."))
assert False
_build_image(options, task_options, session, args, 'livecd')
@ -4210,33 +4210,33 @@ def handle_spin_appliance(options, session, args):
parser.add_option("--nowait", action="store_false", dest="wait",
help=_("Don't wait on appliance creation"))
parser.add_option("--noprogress", action="store_true",
help=_("Do not display progress of the upload."))
help=_("Do not display progress of the upload"))
parser.add_option("--background", action="store_true",
help=_("Run the appliance creation task at a lower priority."))
help=_("Run the appliance creation task at a lower priority"))
parser.add_option("--ksurl", metavar="SCMURL",
help=_("The URL to the SCM containing the kickstart file."))
help=_("The URL to the SCM containing the kickstart file"))
parser.add_option("--ksversion", metavar="VERSION",
help=_("The syntax version used in the kickstart file."))
help=_("The syntax version used in the kickstart file"))
parser.add_option("--scratch", action="store_true",
help=_("Create a scratch appliance"))
parser.add_option("--repo",
help=_("Specify a comma-separated list of repos that will override\n" +
"the repo used to install RPMs in the appliance. The \n" +
help=_("Specify a comma-separated list of repos that will override " +
"the repo used to install RPMs in the appliance. The " +
"build tag repo associated with the target is the default."))
parser.add_option("--version", metavar="VERSION", default=None,
help=_("Set an appliance version; used in .xml metadata."))
parser.add_option("--name", metavar="NAME", default=None,
help=_("Specify the appliance file name."))
help=_("Specify the appliance file name"))
parser.add_option("--version", metavar="VERSION", default=None,
help=_("Set an appliance version, used in .xml metadata"))
parser.add_option("--release", metavar="RELEASE", default=None,
help=_("Set an appliance release number; used in .xml metadata."))
help=_("Set an appliance release number, used in .xml metadata"))
parser.add_option("--vmem", metavar="VMEM", default=None,
help=_("Set the amount of virtual memory in the appliance in MB,\n" +
"default is 512."))
help=_("Set the amount of virtual memory in the appliance in MB, " +
"default is 512"))
parser.add_option("--vcpu", metavar="VCPU", default=None,
help=_("Set the number of virtual cpus in the appliance,\n" +
"default is 1."))
help=_("Set the number of virtual cpus in the appliance, " +
"default is 1"))
parser.add_option("--format", metavar="DISK_FORMAT", default='raw',
help=_("Disk format, default is raw. Other options are qcow,\n" +
help=_("Disk format, default is raw. Other options are qcow, " +
"qcow2, and vmx."))
(task_options, args) = parser.parse_args(args)
@ -4244,8 +4244,8 @@ def handle_spin_appliance(options, session, args):
# Make sure the target and kickstart is specified.
if len(args) != 3:
parser.error(_("Three arguments are required: an architecture, " +
"a build target, and a relative \npath to a " +
"kickstart file ."))
"a build target, and a relative path to a " +
"kickstart file."))
assert False
_build_image(options, task_options, session, args, 'appliance')
@ -4256,7 +4256,7 @@ def _build_image(options, task_opts, session, args, img_type):
"""
if img_type not in ('livecd', 'appliance'):
raise koji.GenericError, 'Unrecognized image type: %s\n' % img_type
raise koji.GenericError, 'Unrecognized image type: %s' % img_type
activate_session(session)
# Set the task's priority. Users can only lower it with --background.