more cleanups from refactoring
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
parent
74dc5b96cb
commit
0197f8da13
2 changed files with 12 additions and 10 deletions
|
|
@ -35,6 +35,7 @@ import tempfile
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
TYPE_PREFIX = "__"
|
||||
CODE_HEADER = "#!/bin/sh -e\n"
|
||||
|
||||
class Cdist:
|
||||
"""Cdist main class to hold arbitrary data"""
|
||||
|
|
@ -102,7 +103,7 @@ class Cdist:
|
|||
log.debug("%s exploring %s using %s storing to %s",
|
||||
cdist_object, explorer, remote_cmd, output)
|
||||
|
||||
self.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
||||
cdist.exec.run_or_fail(remote_cmd, stdout=output_fd, remote_prefix=self.remote_prefix)
|
||||
output_fd.close()
|
||||
|
||||
def init_deploy(self):
|
||||
|
|
@ -240,7 +241,7 @@ class Cdist:
|
|||
self.run_initial_manifest()
|
||||
|
||||
old_objects = []
|
||||
objects = self.list_objects()
|
||||
objects = self.path.list_objects()
|
||||
|
||||
# Continue process until no new objects are created anymore
|
||||
while old_objects != objects:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue