From 3dda2f5dbf8e6402063fe16f4228b9044d7ef16d Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Feb 28 2018 17:22:05 +0000
Subject: handle internal_dev_setup opt earlier


---

diff --git a/koji/__init__.py b/koji/__init__.py
index 328f60a..8e40e30 100644
--- a/koji/__init__.py
+++ b/koji/__init__.py
@@ -1529,6 +1529,13 @@ name=build
 # Koji tag: %(tag_name)s
 """ % locals())
 
+    if bind_opts:
+        # disable internal_dev_setup unless opts explicitly say otherwise
+        opts.setdefault('internal_dev_setup', False)
+
+    if 'internal_dev_setup' in opts:
+        config_opts['internal_dev_setup'] = opts['internal_dev_setup']
+
     parts.append("\n")
     for key in sorted(config_opts):
         value = config_opts[key]
@@ -1540,17 +1547,11 @@ name=build
     parts.append("\n")
 
     if bind_opts:
-        # disable internal_dev_setup unless opts explicitly say otherwise
-        opts.setdefault('internal_dev_setup', False)
         for key in bind_opts.keys():
             for mnt_src, mnt_dest in six.iteritems(bind_opts.get(key)):
                 parts.append("config_opts['plugin_conf']['bind_mount_opts'][%r].append((%r, %r))\n" % (key, mnt_src, mnt_dest))
         parts.append("\n")
 
-    if 'internal_dev_setup' in opts:
-        parts.append("config_opts['internal_dev_setup'] = %r\n"
-                % bool(opts['internal_dev_setup']))
-
     for key in sorted(macros):
         value = macros[key]
         parts.append("config_opts['macros'][%r] = %r\n" % (key, value))