matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Additionaly improve hostdir fix.

Browse source
This commit is contained in:
Darko Poljak 2016-07-10 21:28:30 +02:00
parent 92278ef5b0
commit 3b91ace4ea
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cdist/exec/local.py
View file

@ -62,9 +62,11 @@ class Local(object):
base_path_parent = tempfile.mkdtemp() base_path_parent = tempfile.mkdtemp()
# TODO: the below atexit hook nukes any debug info we would have # TODO: the below atexit hook nukes any debug info we would have
# if cdist exits with error. # if cdist exits with error.
#import atexit # import atexit
#atexit.register(lambda: shutil.rmtree(base_path_parent)) # atexit.register(lambda: shutil.rmtree(base_path_parent))
self.hostdir = self._hostdir() self.hostdir = self._hostdir()
self.log.debug("Calculated temp dir for target \"{}\" is "
"\"{}\"".format(self.target_host, self.hostdir))
self.base_path = os.path.join(base_path_parent, self.hostdir) self.base_path = os.path.join(base_path_parent, self.hostdir)
self._init_log() self._init_log()
@ -97,8 +99,9 @@ class Local(object):
return None return None
def _hostdir(self): def _hostdir(self):
# Do not assume target_host is anything that can be used as a directory name. # Do not assume target_host is anything that can be used as a
# Instead use a hash, which is know to work as directory name. # directory name.
# Instead use a hash, which is known to work as directory name.
return hashlib.md5(self.target_host.encode('utf-8')).hexdigest() return hashlib.md5(self.target_host.encode('utf-8')).hexdigest()
def _init_log(self): def _init_log(self):
@ -239,7 +242,7 @@ class Local(object):
message_prefix=message_prefix) message_prefix=message_prefix)
def save_cache(self): def save_cache(self):
destination = os.path.join(self.cache_path, self.target_host) destination = os.path.join(self.cache_path, self.hostdir)
self.log.debug("Saving " + self.base_path + " to " + destination) self.log.debug("Saving " + self.base_path + " to " + destination)
try: try:

1
docs/changelog
View file

@ -2,6 +2,7 @@ Changelog
--------- ---------
next: next:
* Core: Fix hostdir: use hash instead of target host (Steven Armstrong)
* Core: pep8 (Darko Poljak) * Core: pep8 (Darko Poljak)
* Documentation: Restructure and fix and improve docs and manpages (Darko Poljak) * Documentation: Restructure and fix and improve docs and manpages (Darko Poljak)
* Core: Add files directory for static files (Darko Poljak) * Core: Add files directory for static files (Darko Poljak)