From 3c81209b34d8de3c114139c7258e3fab662ad99b Mon Sep 17 00:00:00 2001
From: Stefano Rivera <stefanor@ubuntu.com>
Date: Wed, 28 Mar 2012 14:47:30 +0200
Subject: [PATCH] backportpackage: Prompt to delete existing workdirs (LP:
 #885514)

---
 backportpackage  | 9 ++++++++-
 debian/changelog | 1 +
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/backportpackage b/backportpackage
index a475fa8..1c2d9e8 100755
--- a/backportpackage
+++ b/backportpackage
@@ -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)
diff --git a/debian/changelog b/debian/changelog
index 7d6a779..4b8bc3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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.