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

Merge branch 'master' into exit_code_and_sigint_cleanup

Browse source
This commit is contained in:
Nico Schottelius 2012-03-09 23:18:37 +01:00
commit ef4b217d43
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
doc/man/man7/cdist-stages.text
View file

@ -27,7 +27,7 @@ The initial manifest, which should be used for mappings of hosts to types,
is executed. This stage creates objects in a cconfig database that contains is executed. This stage creates objects in a cconfig database that contains
the objects as defined in the manifest for the specific host. In this stage, the objects as defined in the manifest for the specific host. In this stage,
no conflicts may occur, i.e. no object of the same type with the same id may no conflicts may occur, i.e. no object of the same type with the same id may
be created. be created, if it has different parameters.
STAGE 3: OBJECT INFORMATION RETRIEVAL STAGE 3: OBJECT INFORMATION RETRIEVAL
@ -44,7 +44,7 @@ Every object is checked whether its type has a executable manifest. The
manifest script may generate and change the created objects. In other words, manifest script may generate and change the created objects. In other words,
one type can reuse other types. one type can reuse other types.
For instance the object __apache/www.test.ch is of type __apache, which may For instance the object __apache/www.example.org is of type __apache, which may
contain a manifest script, which creates new objects of type __file. contain a manifest script, which creates new objects of type __file.
The newly created objects are merged back into the existing tree. No conflicts The newly created objects are merged back into the existing tree. No conflicts

2
lib/cdist/exec/remote.py
View file

@ -78,7 +78,7 @@ class Remote(object):
self.rmdir(destination) self.rmdir(destination)
command = self._copy.split() command = self._copy.split()
# support rsync by appending a "/" to the source if it's a directory # support rsync by appending a "/" to the source if it's a directory
if os.path.isdir(source) == True: if os.path.isdir(source):
command.extend(["-r", source + "/", self.target_host + ":" + destination]) command.extend(["-r", source + "/", self.target_host + ":" + destination])
else: else:
command.extend(["-r", source, self.target_host + ":" + destination]) command.extend(["-r", source, self.target_host + ":" + destination])