backportpackage: Prompt to delete existing workdirs (LP: #885514)

This commit is contained in:
Stefano Rivera 2012-03-28 14:47:30 +02:00
parent ecc9501387
commit 3c81209b34
2 changed files with 9 additions and 1 deletions

View File

@ -233,9 +233,16 @@ def do_upload(workdir, package, bp_version, changes, upload, prompt):
def do_backport(workdir, pkg, suffix, release, release_pocket, build, builder,
update, upload, prompt):
dirname = '%s-%s' % (pkg.source, release)
pkg.unpack(dirname)
srcdir = os.path.join(workdir, dirname)
if os.path.exists(srcdir):
question = 'Working directory %s already exists. Delete it?' % srcdir
if YesNoQuestion().ask(question, 'no') == 'no':
sys.exit(1)
shutil.rmtree(srcdir)
pkg.unpack(dirname)
bp_version = get_backport_version(pkg.version.full_version, suffix,
upload, release)
bp_dist = get_backport_dist(release, release_pocket)

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ 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)
[ Daniel Hahler ]
* ubuntutools/archive.py: use ProxyHandler in _download_file.