Rename --launchpad to --lpinstance

This commit is contained in:
Stefano Rivera 2010-12-21 15:14:45 +02:00
parent 8dd88f18f8
commit 7977a367fd
2 changed files with 7 additions and 7 deletions

View File

@ -98,8 +98,8 @@ def parse(args):
default=None, default=None,
help='Specify a working directory (default: temporary dir)', help='Specify a working directory (default: temporary dir)',
metavar='WORKDIR') metavar='WORKDIR')
p.add_option('-l', '--launchpad', p.add_option('--lpinstance',
dest='launchpad', dest='lpinstance',
default=None, default=None,
help='Launchpad instance to connect to (default: production)', help='Launchpad instance to connect to (default: production)',
metavar='INSTANCE') metavar='INSTANCE')
@ -119,8 +119,8 @@ def parse(args):
opts.update = config.get_value('UPDATE_BUILDER', boolean=True) opts.update = config.get_value('UPDATE_BUILDER', boolean=True)
if opts.workdir is None: if opts.workdir is None:
opts.workdir = config.get_value('WORKDIR') opts.workdir = config.get_value('WORKDIR')
if opts.launchpad is None: if opts.lpinstance is None:
opts.launchpad = config.get_value('LPINSTANCE') opts.lpinstance = config.get_value('LPINSTANCE')
if not opts.upload and not opts.workdir: if not opts.upload and not opts.workdir:
p.error('Please specify either a working dir or an upload target!') p.error('Please specify either a working dir or an upload target!')
@ -276,7 +276,7 @@ def main(args):
script_name = os.path.basename(sys.argv[0]) script_name = os.path.basename(sys.argv[0])
lp = launchpadlib.launchpad.Launchpad.login_anonymously(script_name, lp = launchpadlib.launchpad.Launchpad.login_anonymously(script_name,
opts.launchpad) opts.lpinstance)
if not opts.dest_releases: if not opts.dest_releases:
try: try:

View File

@ -80,7 +80,7 @@ unpacked, built into, and otherwise manipulated in
\fIWORKDIR\fR. Otherwise, a temporary directory is created, which is \fIWORKDIR\fR. Otherwise, a temporary directory is created, which is
deleted before \fIbackportpackage\fR exits. deleted before \fIbackportpackage\fR exits.
.TP .TP
.B \-l \fIINSTANCE\fR, \fB\-\-launchpad\fR=\fIINSTANCE\fR .B \-\-lpinstance\fR=\fIINSTANCE\fR
Use the specified instance of Launchpad (e.g. "staging"), instead of Use the specified instance of Launchpad (e.g. "staging"), instead of
the default of "production". the default of "production".
.TP .TP
@ -109,7 +109,7 @@ The default value for \fB--update\fR.
The default value for \fB--workdir\fR. The default value for \fB--workdir\fR.
.TP .TP
.BR BACKPORTPACKAGE_LPINSTANCE ", " UBUNTUTOOLS_LPINSTANCE .BR BACKPORTPACKAGE_LPINSTANCE ", " UBUNTUTOOLS_LPINSTANCE
The default value for \fB--launchpad\fR. The default value for \fB--lpinstance\fR.
.SH EXAMPLES .SH EXAMPLES
Test-build in your PPA a backport of znc from the current development Test-build in your PPA a backport of znc from the current development
release to your workstation's release, deleting the build products release to your workstation's release, deleting the build products