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

Merge remote-tracking branch 'steven/master'

Browse source
This commit is contained in:
Nico Schottelius 2011-10-14 23:52:00 +02:00
commit 72e930ac1c
4 changed files with 23 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
lib/cdist/core/explorer.py
View file

@ -105,10 +105,14 @@ class Explorer(object):
def transfer_type_explorers(self, cdist_type):
"""Transfer the type explorers for the given type to the remote side."""
if cdist_type.explorers:
source = os.path.join(self.local.type_path, cdist_type.explorer_path)
destination = os.path.join(self.remote.type_path, cdist_type.explorer_path)
self.remote.mkdir(destination)
self.remote.transfer(source, destination)
if cdist_type.explorers_transferred:
log.debug("Skipping retransfer of type explorers for: %s", cdist_type)
else:
source = os.path.join(self.local.type_path, cdist_type.explorer_path)
destination = os.path.join(self.remote.type_path, cdist_type.explorer_path)
self.remote.mkdir(destination)
self.remote.transfer(source, destination)
cdist_type.explorers_transferred = True
def transfer_object_parameters(self, cdist_object):
"""Transfer the parameters for the given object to the remote side."""

2
lib/cdist/core/type.py
View file

@ -67,7 +67,7 @@ class Type(object):
self.gencode_remote_path = os.path.join(self.name, "gencode-remote")
self.manifest_path = os.path.join(self.name, "manifest")
self.transferred_explorers = False
self.explorers_transferred = False
self.__explorers = None
self.__required_parameters = None