From facb8eca6f7cf9e41f4f171daf5fc90212e43ff8 Mon Sep 17 00:00:00 2001
From: Tomas Kopecek <tkopecek@redhat.com>
Date: Oct 27 2017 21:20:40 +0000
Subject: delete build directory if cg_import fails


Related: https://pagure.io/koji/issue/584

---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index 2579b32..cb0b59a 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -5233,8 +5233,12 @@ class CG_Importer(object):
         # finalize import
         self.get_build()
         self.import_brs()
-        self.import_outputs()
-        self.import_metadata()
+        try:
+            self.import_outputs()
+            self.import_metadata()
+        except Exception:
+            self.check_build_dir(delete=True)
+            raise
 
         koji.plugin.run_callbacks('postImport', type='cg', metadata=metadata,
                                   directory=directory, build=self.buildinfo)
@@ -5313,11 +5317,15 @@ class CG_Importer(object):
             self.buildinfo['volume_name'] = vol['name']
 
 
-    def check_build_dir(self):
+    def check_build_dir(self, delete=False):
         """Check that the import directory does not already exist"""
         path = koji.pathinfo.build(self.buildinfo)
         if os.path.lexists(path):
-            raise koji.GenericError("Destination directory already exists: %s" % path)
+            if delete:
+                logger.warning("Deleting build directory: %s", path)
+                koji.util.rmtree(olddir)
+            else:
+                raise koji.GenericError("Destination directory already exists: %s" % path)
 
 
     def prep_build(self):