From 18f3109ceec8c49ee49faaaaa4f3a0e21c1cd17c Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Wed, 28 Mar 2012 23:25:33 +0200 Subject: [PATCH] * backportpackage - Prompt to delete existing workdirs (LP: #885514) - Support a BACKPORTPACKAGE_UPLOAD configuration/enviornment variable (LP: #693217) --- backportpackage | 2 ++ debian/changelog | 5 ++++- doc/backportpackage.1 | 3 +++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/backportpackage b/backportpackage index 1c2d9e8..de24221 100755 --- a/backportpackage +++ b/backportpackage @@ -127,6 +127,8 @@ def parse(args): opts.workdir = config.get_value('WORKDIR') if opts.lpinstance is None: opts.lpinstance = config.get_value('LPINSTANCE') + if opts.upload is None: + opts.upload = config.get_value('UPLOAD') if not opts.upload and not opts.workdir: parser.error('Please specify either a working dir or an upload target!') if opts.upload and opts.upload.startswith('ppa:'): diff --git a/debian/changelog b/debian/changelog index 4b8bc3e..41d870a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,10 @@ ubuntu-dev-tools (0.140) UNRELEASED; urgency=low * Update machine-readable copyright Format to 1.0. * pbuilder-dist: Use the same chroot, whether the system-architecture was the supplied architecture or was chosen by default (LP: #943435) - * backportpackage: Prompt to delete existing workdirs (LP: #885514) + * backportpackage + - Prompt to delete existing workdirs (LP: #885514) + - Support a BACKPORTPACKAGE_UPLOAD configuration/enviornment variable + (LP: #693217) [ Daniel Hahler ] * ubuntutools/archive.py: use ProxyHandler in _download_file. diff --git a/doc/backportpackage.1 b/doc/backportpackage.1 index 4586750..8bd2bcc 100644 --- a/doc/backportpackage.1 +++ b/doc/backportpackage.1 @@ -129,6 +129,9 @@ The default value for \fB\-\-builder\fR. .BR BACKPORTPACKAGE_UPDATE_BUILDER ", " UBUNTUTOOLS_UPDATE_BUILDER The default value for \fB--update\fR. .TP +.B BACKPORTPACKAGE_UPLOAD +The default value for \fB--upload\fR. +.TP .BR BACKPORTPACKAGE_WORKDIR ", " UBUNTUTOOLS_WORKDIR The default value for \fB--workdir\fR. .TP