WIP experiments for buildout rebase

slapos/grid/utils.py

@@ -378,11 +378,11 @@ def bootstrapBuildout(path, logger, buildout=None,
       # buildout is importable, so use this one
       invocation_list.extend(["-c", "import sys ; sys.path=" + str(sys.path) +
         " ; import zc.buildout.buildout ; sys.argv[1:1]=" +
-        repr(additional_buildout_parameter_list + ['bootstrap', '--all-local']) + " ; "
+        repr(additional_buildout_parameter_list + ['bootstrap']) + " ; "
         "zc.buildout.buildout.main()"])
 
   if buildout is not None:
-    invocation_list.append('bootstrap', '--all-local')
+    invocation_list.append('bootstrap')
   try:
     umask = os.umask(SAFE_UMASK)
     logger.debug('Set umask from %03o to %03o' % (umask, SAFE_UMASK))