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

re-implement correct caching

Browse source 
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius 2011-09-13 18:15:04 +02:00
commit 780fd5625e
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
bin/cdist
View file

@ -113,6 +113,8 @@ class Cdist:
self.base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir)) self.base_dir = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
self.conf_dir = os.path.join(self.base_dir, "conf") self.conf_dir = os.path.join(self.base_dir, "conf")
self.cache_base_dir = os.path.join(self.base_dir, "cache")
self.cache_dir = os.path.join(self.cache_base_dir, self.target_host)
self.global_explorer_dir = os.path.join(self.conf_dir, "explorer") self.global_explorer_dir = os.path.join(self.conf_dir, "explorer")
self.lib_dir = os.path.join(self.base_dir, "lib") self.lib_dir = os.path.join(self.base_dir, "lib")
self.manifest_dir = os.path.join(self.conf_dir, "manifest") self.manifest_dir = os.path.join(self.conf_dir, "manifest")
@ -151,10 +153,11 @@ class Cdist:
# "other globals referenced by the __del__() method may already have been deleted # "other globals referenced by the __del__() method may already have been deleted
# or in the process of being torn down (e.g. the import machinery shutting down)" # or in the process of being torn down (e.g. the import machinery shutting down)"
# #
if self.debug: log.debug("Saving" + self.temp_dir + "to " + self.cache_dir)
log.debug("Skipping removal of " + self.temp_dir) # Remove previous cache
else: if os.path.exists(self.cache_dir):
shutil.rmtree(self.temp_dir) shutil.rmtree(self.cache_dir)
os.rename(self.temp_dir, self.cache_dir)
def exit_error(self, *args): def exit_error(self, *args):
log.error(*args) log.error(*args)