Merge branch 'master' into preos

This commit is contained in:
Nico Schottelius 2014-01-10 00:42:28 +01:00
commit ea286c600f
2 changed files with 7 additions and 1 deletions

View file

@ -194,7 +194,12 @@ class Local(object):
return self.run(command=command, env=env, return_output=return_output, message_prefix=message_prefix) return self.run(command=command, env=env, return_output=return_output, message_prefix=message_prefix)
def save_cache(self): def save_cache(self):
destination = os.path.join(self.cache_path, self.target_host) if os.path.isabs(self.target_host):
hostdir = self.target_host[1:]
else:
hostdir = self.target_host
destination = os.path.join(self.cache_path, hostdir)
self.log.debug("Saving " + self.base_path + " to " + destination) self.log.debug("Saving " + self.base_path + " to " + destination)
try: try:

View file

@ -6,6 +6,7 @@ Changelog
3.0.1: 3.0.1:
* Core: Copy only files, not directories (Steven Armstrong) * Core: Copy only files, not directories (Steven Armstrong)
* Core: Allow hostnames to start with /
* Type __line: Remove unecessary backslash escape * Type __line: Remove unecessary backslash escape
* Type __directory: Add messaging support (Daniel Heule) * Type __directory: Add messaging support (Daniel Heule)
* Type __directory: Do not generate code if mode is 0xxx ((Daniel Heule) * Type __directory: Do not generate code if mode is 0xxx ((Daniel Heule)