From 263a8a73a7ec5df08b965488e71ecf2d81703140 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 12 Aug 2013 12:11:43 +0200 Subject: [PATCH] minor cleanups Signed-off-by: Nico Schottelius --- cdist/exec/local.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/cdist/exec/local.py b/cdist/exec/local.py index d80386c5..854a1832 100644 --- a/cdist/exec/local.py +++ b/cdist/exec/local.py @@ -85,9 +85,7 @@ class Local(object): def _init_conf_dirs(self): self.conf_dirs = [] - # Comes with the distribution - system_conf_dir = os.path.abspath(os.path.join(os.path.dirname(cdist.__file__), "conf")) - self.conf_dirs.append(system_conf_dir) + self.conf_dirs.append(self.dist_conf_dir) # Is the default place for user created explorer, type and manifest if self.home_dir: @@ -99,7 +97,7 @@ class Local(object): cdist_path_dirs.reverse() self.conf_dirs.extend(cdist_path_dirs) - # Add user supplied directories + # Add command line supplied directories if self._add_conf_dirs: self.conf_dirs.extend(self._add_conf_dirs)