contradict/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

minor cleanups

Browse source 
Signed-off-by: Nico Schottelius <nico@bento.schottelius.org>
This commit is contained in:
Nico Schottelius 2013-08-12 12:11:43 +02:00
parent 32f878ad00
commit 263a8a73a7
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cdist/exec/local.py
View file

@ -85,9 +85,7 @@ class Local(object):
def _init_conf_dirs(self): def _init_conf_dirs(self):
self.conf_dirs = [] self.conf_dirs = []
# Comes with the distribution self.conf_dirs.append(self.dist_conf_dir)
system_conf_dir = os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf"))
self.conf_dirs.append(system_conf_dir)
# Is the default place for user created explorer, type and manifest # Is the default place for user created explorer, type and manifest
if self.home_dir: if self.home_dir:
@ -99,7 +97,7 @@ class Local(object):
cdist_path_dirs.reverse() cdist_path_dirs.reverse()
self.conf_dirs.extend(cdist_path_dirs) self.conf_dirs.extend(cdist_path_dirs)
# Add user supplied directories # Add command line supplied directories
if self._add_conf_dirs: if self._add_conf_dirs:
self.conf_dirs.extend(self._add_conf_dirs) self.conf_dirs.extend(self._add_conf_dirs)