summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2018-07-24 15:20:36 +0100
committerCarl Hetherington <cth@carlh.net>2018-07-24 15:20:36 +0100
commit5470c2f2bd4f28c7e5ac2b498eb22c3b39414304 (patch)
tree290ff56a01cca2f8218043563254fd5df314444e
parentbaba5c2037c74d65dd771a64f55c2d5e1f8b28e1 (diff)
Tweak to arguments for packaging.
-rwxr-xr-xcdist9
1 files changed, 8 insertions, 1 deletions
diff --git a/cdist b/cdist
index aaebbff..a45058c 100755
--- a/cdist
+++ b/cdist
@@ -953,7 +953,14 @@ def main():
output_dir = args.output
makedirs(output_dir)
- target.package(args.project, args.checkout, output_dir, argument_options(args))
+
+ # Start with the options passed on the command line
+ options = copy.copy(argument_options(args))
+ # Fill in the defaults
+ tree = globals.trees.get(args.project, args.checkout, target)
+ tree.add_defaults(options)
+
+ target.package(args.project, args.checkout, output_dir, options)
if not args.keep:
target.cleanup()