diff --git a/backportpackage b/backportpackage index d9d12af..442a2a8 100755 --- a/backportpackage +++ b/backportpackage @@ -98,8 +98,8 @@ def parse(args): default=None, help='Specify a working directory (default: temporary dir)', metavar='WORKDIR') - p.add_option('-l', '--launchpad', - dest='launchpad', + p.add_option('--lpinstance', + dest='lpinstance', default=None, help='Launchpad instance to connect to (default: production)', metavar='INSTANCE') @@ -119,8 +119,8 @@ def parse(args): opts.update = config.get_value('UPDATE_BUILDER', boolean=True) if opts.workdir is None: opts.workdir = config.get_value('WORKDIR') - if opts.launchpad is None: - opts.launchpad = config.get_value('LPINSTANCE') + if opts.lpinstance is None: + opts.lpinstance = config.get_value('LPINSTANCE') if not opts.upload and not opts.workdir: 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]) lp = launchpadlib.launchpad.Launchpad.login_anonymously(script_name, - opts.launchpad) + opts.lpinstance) if not opts.dest_releases: try: diff --git a/doc/backportpackage.1 b/doc/backportpackage.1 index f00e352..265d716 100644 --- a/doc/backportpackage.1 +++ b/doc/backportpackage.1 @@ -80,7 +80,7 @@ unpacked, built into, and otherwise manipulated in \fIWORKDIR\fR. Otherwise, a temporary directory is created, which is deleted before \fIbackportpackage\fR exits. .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 the default of "production". .TP @@ -109,7 +109,7 @@ The default value for \fB--update\fR. The default value for \fB--workdir\fR. .TP .BR BACKPORTPACKAGE_LPINSTANCE ", " UBUNTUTOOLS_LPINSTANCE -The default value for \fB--launchpad\fR. +The default value for \fB--lpinstance\fR. .SH EXAMPLES Test-build in your PPA a backport of znc from the current development release to your workstation's release, deleting the build products