Add setup_proc as initializer argument to Builder

Setting it via direct attribute access, when everything
else is set via initializer arguments, is just strange.

2 files changed, 4 insertions, 5 deletions

diff --git a/morphlib/app.py b/morphlib/app.py
index 61fd0b22..8d10e644 100755
--- a/morphlib/app.py
+++ b/morphlib/app.py
@@ -328,9 +328,7 @@ class Morph(cliapp.Application):
                 self.create_staging_area()
             builder = morphlib.builder2.Builder(self,
                     staging_area, lac, rac, lrc, build_env,
-                    self.settings['max-jobs'])
-            if setup_proc:
-                builder.setup_proc = True
+                    self.settings['max-jobs'], setup_proc)
 
             to_install = []
             for group in order.groups:
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index e42e7b0f..37abdce2 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -554,7 +554,8 @@ class Builder(object): # pragma: no cover
     }
 
     def __init__(self, app, staging_area, local_artifact_cache,
-                 remote_artifact_cache, repo_cache, build_env, max_jobs):
+                 remote_artifact_cache, repo_cache, build_env, max_jobs,
+                 setup_proc):
         self.app = app
         self.staging_area = staging_area
         self.local_artifact_cache = local_artifact_cache
@@ -562,7 +563,7 @@ class Builder(object): # pragma: no cover
         self.repo_cache = repo_cache
         self.build_env = build_env
         self.max_jobs = max_jobs
-        self.setup_proc = False
+        self.setup_proc = setup_proc
         
     def build_and_cache(self, artifact):
         kind = artifact.source.morphology['kind']