summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-06-16 17:51:30 +0100
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-06-16 17:51:30 +0100
commit8c84af971d1cdfb148b37f548beaf1eca3d74ced (patch)
tree3b69d00f107f4277f6b7029f8f01d6ce7d9d8980
parent22abdfef781b98f3638c263a590931fa57825c1d (diff)
downloadmorph-8c84af971d1cdfb148b37f548beaf1eca3d74ced.tar.gz
Add '--' when calling run-parts to specify the end of the options.baserock/pedroalvarez/system-integration-fixup2
Using '--' we prevent passing options in SYSTEM_INTEGRATION_PATH.
-rw-r--r--morphlib/builder2.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/builder2.py b/morphlib/builder2.py
index f8969973..0248b7de 100644
--- a/morphlib/builder2.py
+++ b/morphlib/builder2.py
@@ -743,7 +743,7 @@ class SystemBuilder(BuilderBase): # pragma: no cover
mounted.append(path)
self.app.runcmd(['chroot', rootdir, 'sh', '-c',
- 'cd / && run-parts "$1"', '-', SYSTEM_INTEGRATION_PATH],
+ 'cd / && run-parts -- "$1"', '-', SYSTEM_INTEGRATION_PATH],
env=env)
except BaseException, e:
self.app.status(