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

big change for pre4

Browse source 
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
This commit is contained in:
Nico Schottelius 2012-10-30 16:16:59 +01:00
parent 92d21a4625
commit e7be0cceab
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cdist/exec/local.py
View file

@ -165,15 +165,20 @@ class Local(object):
for sub_dir in [ "explorer", "manifest", "type" ]: for sub_dir in [ "explorer", "manifest", "type" ]:
current_dir = os.path.join(conf_dir, sub_dir) current_dir = os.path.join(conf_dir, sub_dir)
# Allow conf dirs to contain only partial content
if not os.path.exists(current_dir):
continue
for entry in os.listdir(current_dir): for entry in os.listdir(current_dir):
rel_entry_path = os.path.join(sub_dir, entry) rel_entry_path = os.path.join(sub_dir, entry)
src = os.path.join(conf_dir, sub_dir, entry) src = os.path.join(conf_dir, sub_dir, entry)
dst = os.path.join(self.conf_path, entry) dst = os.path.join(self.conf_path, sub_dir, entry)
# Already exists? remove and link # Already exists? remove and link
if os.path.exists(dst): if os.path.exists(dst):
os.unlink(dst) os.unlink(dst)
self.log.debug("Linking %s to %s ..." % (src, dst))
try: try:
os.symlink(src, dst) os.symlink(src, dst)
except OSError as e: except OSError as e:

1
docs/changelog
View file

@ -7,6 +7,7 @@ Changelog
2.1.0pre4: 2.1.0pre4:
* Dist: PyPi: Move cdist.py to script/cdist to avoid double import * Dist: PyPi: Move cdist.py to script/cdist to avoid double import
* Added internal support for multiple configuration directories
2.1.0pre3: 2012-10-30 2.1.0pre3: 2012-10-30
* Dist: PyPi: Types and explorer included as package data * Dist: PyPi: Types and explorer included as package data