From fc3ae0c72b692a2d13dd9ee92ec0eb9ce11edeab Mon Sep 17 00:00:00 2001
From: Lars Karlitski <lars@karlitski.net>
Date: Mon, 15 Jul 2019 21:55:58 +0200
Subject: [PATCH] osbuild.py: always save the last tree of a pipeline

Also fix crash when pipeline has no base and is empty.
---
 osbuild.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/osbuild.py b/osbuild.py
index 6218e1e0..0faaf346 100644
--- a/osbuild.py
+++ b/osbuild.py
@@ -266,8 +266,10 @@ class Pipeline:
             if self.assembler:
                 r = self.assembler.run(tree, output_dir, interactive)
                 results["assembler"] = r
-            elif objects:
-                output_tree = os.path.join(objects, self.stages[-1].id if self.stages else self.base)
+
+            last = self.stages[-1].id if self.stages else self.base
+            if objects and last:
+                output_tree = f"{objects}/{last}"
                 shutil.rmtree(output_tree, ignore_errors=True)
                 os.makedirs(output_tree, mode=0o755)
                 subprocess.run(["cp", "-a", f"{tree}/.", output_tree], check=True)