fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

implement conf-dir from CDIST_PATH environment variable

Browse source 
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
This commit is contained in:
Steven Armstrong 2012-11-30 13:48:34 +01:00
commit 56b6c95ed4
4 changed files with 37 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cdist/exec/local.py
View file

@ -23,6 +23,7 @@
import io
import os
import sys
import re
import subprocess
import shutil
import logging
@ -37,7 +38,7 @@ class Local(object):
Directly accessing the local side from python code is a bug.
"""
def __init__(self, target_host, out_path, exec_path, add_conf_dirs=[], cache_dir=None):
def __init__(self, target_host, out_path, exec_path, add_conf_dirs=None, cache_dir=None):
self.target_host = target_host
self.out_path = out_path
@ -92,6 +93,12 @@ class Local(object):
if self.home_dir:
self.conf_dirs.append(self.home_dir)
# Add directories defined in the CDIST_PATH environment variable
if 'CDIST_PATH' in os.environ:
cdist_path_dirs = re.split(r'(?<!\\):', os.environ['CDIST_PATH'])
cdist_path_dirs.reverse()
self.conf_dirs.extend(cdist_path_dirs)
# Add user supplied directories
if self._add_conf_dirs:
self.conf_dirs.extend(self._add_conf_dirs)