From fdaa2e1a66d7a3ab3919418ca501e323be4a36a5 Mon Sep 17 00:00:00 2001
From: chloenayon <chloe.kaubisch@gmail.com>
Date: Tue, 4 Aug 2020 15:20:50 +0200
Subject: [PATCH] osbuild: require output_directory

Make the output_directory argument in Pipeline.assemble
and Assembler.run required. The qemu assembler assumes
it is passed in args and will crash without it. Making
it mandatory prevents this.
---
 osbuild/pipeline.py | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/osbuild/pipeline.py b/osbuild/pipeline.py
index 4cd3ee4a..6c8482ca 100644
--- a/osbuild/pipeline.py
+++ b/osbuild/pipeline.py
@@ -3,7 +3,6 @@ import hashlib
 import json
 import os
 import tempfile
-from typing import Optional
 
 from .api import API
 from . import buildroot
@@ -119,7 +118,7 @@ class Assembler:
             description["id"] = self.id
         return description
 
-    def run(self, tree, runner, build_tree, monitor, libdir, output_dir=None, var="/var/tmp"):
+    def run(self, tree, runner, build_tree, monitor, libdir, output_dir, var="/var/tmp"):
         with buildroot.BuildRoot(build_tree, runner, libdir, var=var) as build_root:
 
             args = {
@@ -131,11 +130,11 @@ class Assembler:
             }
 
             binds = []
-            if output_dir:
-                output_dir = os.fspath(output_dir)
-                os.makedirs(output_dir, exist_ok=True)
-                binds.append(f"{output_dir}:/run/osbuild/output")
-                args["output_dir"] = "/run/osbuild/output"
+
+            output_dir = os.fspath(output_dir)
+            os.makedirs(output_dir, exist_ok=True)
+            binds.append(f"{output_dir}:/run/osbuild/output")
+            args["output_dir"] = "/run/osbuild/output"
 
             ro_binds = [os.fspath(tree) + ":/run/osbuild/tree"]
 
@@ -282,7 +281,7 @@ class Pipeline:
 
         return results, build_tree, tree
 
-    def assemble(self, object_store, build_tree, tree, monitor, libdir, output_directory: Optional[str]):
+    def assemble(self, object_store, build_tree, tree, monitor, libdir, output_directory):
         results = {"success": True}
 
         if not self.assembler:
@@ -301,7 +300,7 @@ class Pipeline:
                                    build_dir,
                                    monitor,
                                    libdir,
-                                   output_dir=output_dir,
+                                   output_dir,
                                    var=object_store.store)
 
             monitor.result(r)
@@ -320,7 +319,7 @@ class Pipeline:
 
         return results
 
-    def run(self, store, monitor, libdir, output_directory=None):
+    def run(self, store, monitor, libdir, output_directory):
         os.makedirs("/run/osbuild", exist_ok=True)
         results = {}