name parameter correctly add_conf_dirs

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
remotes/origin/feature_files_export
Nico Schottelius 13 years ago
parent d944f2ac19
commit 6ecfb28d93
  1. 4
      cdist/context.py
  2. 2
      scripts/cdist

4
cdist/context.py vendored

@ -38,7 +38,7 @@ class Context(object):
remote_copy,
remote_exec,
initial_manifest=False,
conf_dirs=[],
add_conf_dirs=[],
exec_path=sys.argv[0],
debug=False):
@ -59,7 +59,7 @@ class Context(object):
self.temp_dir = tempfile.mkdtemp()
self.out_path = os.path.join(self.temp_dir, "out")
self.local = local.Local(self.target_host, conf_dirs, self.out_path, self.exec_path)
self.local = local.Local(self.target_host, self.out_path, self.exec_path, add_conf_dirs=add_conf_dirs)
self.initial_manifest = (initial_manifest or
os.path.join(self.local.manifest_path, "init"))

@ -172,7 +172,7 @@ def configinstall_onehost(host, args, mode, parallel):
remote_copy=args.remote_copy,
remote_exec=args.remote_exec,
initial_manifest=args.manifest,
conf_dirs=args.conf_dir,
add_conf_dirs=args.conf_dir,
exec_path=sys.argv[0],
debug=args.debug)

Loading…
Cancel
Save