From 61e32ff3efdfd64e2be04f6477995002d489953d Mon Sep 17 00:00:00 2001 From: Lars Karlitski Date: Sun, 15 Dec 2019 11:20:40 +0100 Subject: [PATCH] pipeline: return new-style result from build pipeline Commit 82a2be53d introduced a new return type from `Pipeline.run()`. It changed the caller in `__main__.py`, but missed that the build pipeline uses the same function. --- osbuild/pipeline.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/osbuild/pipeline.py b/osbuild/pipeline.py index ffb97b1c..54c6c26d 100644 --- a/osbuild/pipeline.py +++ b/osbuild/pipeline.py @@ -201,11 +201,15 @@ class Pipeline: def run(self, store, interactive=False, libdir=None): os.makedirs("/run/osbuild", exist_ok=True) object_store = objectstore.ObjectStore(store) - if self.build: - if not self.build.run(store, interactive, libdir): - return False - results = {} + + if self.build: + r = self.build.run(store, interactive, libdir) + results["build"] = r + if not r["success"]: + results["success"] = False + return results + with self.get_buildtree(object_store) as build_tree: if self.stages: if not object_store.contains(self.tree_id):