From 45e0f797e460944f8e6ba97306a4f016ce61e906 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= <jelmer@jelmer.uk>
Date: Sun, 21 Mar 2021 18:48:24 +0000
Subject: [PATCH] Factor out create_dist.

---
 ognibuild/__init__.py |  1 -
 ognibuild/__main__.py |  1 -
 ognibuild/dist.py     | 36 +++++++++++++++++++++++++++++-------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/ognibuild/__init__.py b/ognibuild/__init__.py
index c7e0bc6..366f1f8 100644
--- a/ognibuild/__init__.py
+++ b/ognibuild/__init__.py
@@ -69,4 +69,3 @@ class UpstreamOutput(object):
 
     def get_declared_dependencies(self):
         raise NotImplementedError(self.get_declared_dependencies)
-
diff --git a/ognibuild/__main__.py b/ognibuild/__main__.py
index ff876b1..78784f5 100644
--- a/ognibuild/__main__.py
+++ b/ognibuild/__main__.py
@@ -25,7 +25,6 @@ from .buildsystem import NoBuildToolsFound, detect_buildsystems
 from .resolver import (
     auto_resolver,
     native_resolvers,
-    UnsatisfiedRequirements,
 )
 from .resolver.apt import AptResolver
 
diff --git a/ognibuild/dist.py b/ognibuild/dist.py
index d136ffa..e71bb4b 100644
--- a/ognibuild/dist.py
+++ b/ognibuild/dist.py
@@ -15,6 +15,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+__all__ = [
+    'UnidentifiedError',
+    'DetailedFailure',
+    'create_dist',
+    'create_dist_schroot',
+    ]
+
 import errno
 import logging
 import os
@@ -33,7 +40,7 @@ from buildlog_consultant.common import (
 )
 
 
-from . import DetailedFailure
+from . import DetailedFailure, UnidentifiedError
 from .buildsystem import NoBuildToolsFound
 from .session import Session
 from .session.schroot import SchrootSession
@@ -129,7 +136,7 @@ def create_dist(
     packaging_tree: Optional[Tree] = None,
     include_controldir: bool = True,
     subdir: Optional[str] = None,
-) -> str:
+) -> Optional[str]:
     from .buildsystem import detect_buildsystems
     from .resolver.apt import AptResolver
     from .buildlog import InstallFixer
@@ -158,9 +165,16 @@ def create_dist(
             session.chdir(reldir)
             run_dist(session, buildsystems, resolver, fixers)
 
-        for path in dc.files:
-            shutil.copy(path, target_dir)
-            return os.path.join(target_dir, os.path.basename(path))
+        try:
+            for path in dc.files:
+                shutil.copy(path, target_dir)
+                return os.path.join(target_dir, os.path.basename(path))
+        finally:
+            for path in dc.files:
+                if os.path.isdir(path):
+                    shutil.rmtree(path)
+                else:
+                    os.unlink(path)
 
         logging.info("No tarball created :(")
         raise DistNoTarball()
@@ -173,7 +187,7 @@ def create_dist_schroot(
     packaging_tree: Optional[Tree] = None,
     include_controldir: bool = True,
     subdir: Optional[str] = None,
-) -> str:
+) -> Optional[str]:
     session = SchrootSession(chroot)
     return create_dist(
         session, tree, target_dir,
@@ -239,6 +253,14 @@ if __name__ == "__main__":
     except NoBuildToolsFound:
         logging.info("No build tools found, falling back to simple export.")
         export(tree, "dist.tar.gz", "tgz", None)
+    except NotImplementedError:
+        logging.info("Build system does not support dist tarball creation, "
+                     "falling back to simple export.")
+        export(tree, "dist.tar.gz", "tgz", None)
+    except UnidentifiedError as e:
+        logging.fatal('Unidentified error: %r', e.lines)
+    except DetailedFailure as e:
+        logging.fatal('Identified error during dist creation: %s', e.error)
     else:
-        print("Created %s" % ret)
+        logging.info("Created %s", ret)
     sys.exit(0)