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

Fix NameError: name 'cdist_object' is not defined, #662

Browse source
This commit is contained in:
Darko Poljak 2018-05-15 12:12:01 +02:00
commit 3cf417fa2b
2 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
cdist/core/explorer.py
View file

@ -214,22 +214,19 @@ class Explorer(object):
def transfer_type_explorers(self, cdist_type): def transfer_type_explorers(self, cdist_type):
"""Transfer the type explorers for the given type to the """Transfer the type explorers for the given type to the
remote side.""" remote side."""
try: if cdist_type.explorers:
if cdist_type.explorers: if cdist_type.name in self._type_explorers_transferred:
if cdist_type.name in self._type_explorers_transferred: self.log.trace(("Skipping retransfer of type explorers "
self.log.trace(("Skipping retransfer of type explorers " "for: %s"), cdist_type)
"for: %s"), cdist_type) else:
else: source = os.path.join(self.local.type_path,
source = os.path.join(self.local.type_path, cdist_type.explorer_path)
cdist_type.explorer_path) destination = os.path.join(self.remote.type_path,
destination = os.path.join(self.remote.type_path, cdist_type.explorer_path)
cdist_type.explorer_path) self.remote.mkdir(destination)
self.remote.mkdir(destination) self.remote.transfer(source, destination)
self.remote.transfer(source, destination) self.remote.run(["chmod", "0700", "%s/*" % (destination)])
self.remote.run(["chmod", "0700", "%s/*" % (destination)]) self._type_explorers_transferred.append(cdist_type.name)
self._type_explorers_transferred.append(cdist_type.name)
except cdist.Error as e:
raise cdist.CdistObjectError(cdist_object, e)
def transfer_object_parameters(self, cdist_object): def transfer_object_parameters(self, cdist_object):
"""Transfer the parameters for the given object to the remote side.""" """Transfer the parameters for the given object to the remote side."""

1
docs/changelog
View file

@ -6,6 +6,7 @@ next:
* New type: __docker_config (Ľubomír Kučera) * New type: __docker_config (Ľubomír Kučera)
* New type: __docker_secret (Ľubomír Kučera) * New type: __docker_secret (Ľubomír Kučera)
* Type __letsencrypt_cert: Rewritten; WARN: breaks backward compatibility (Ľubomír Kučera) * Type __letsencrypt_cert: Rewritten; WARN: breaks backward compatibility (Ľubomír Kučera)
* Core: Fix NameError: name 'cdist_object' is not defined (Darko Poljak)
4.8.4: 2018-04-20 4.8.4: 2018-04-20
* Documentation, type manpages: Fix spelling (Dmitry Bogatov) * Documentation, type manpages: Fix spelling (Dmitry Bogatov)