From 534ccc86ab46268ffffb7e1a88cd2d672a2843f2 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 9 Mar 2012 23:14:06 +0100 Subject: [PATCH 1/2] clearify same object and use example.org in doc Signed-off-by: Nico Schottelius --- doc/man/man7/cdist-stages.text | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/man/man7/cdist-stages.text b/doc/man/man7/cdist-stages.text index c1b73a8d..fa5e28d1 100644 --- a/doc/man/man7/cdist-stages.text +++ b/doc/man/man7/cdist-stages.text @@ -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 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 -be created. +be created, if it has different parameters. 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, 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. The newly created objects are merged back into the existing tree. No conflicts From 5f2f8e2bd2efd404d17004590a5ba3030bd9c86d Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Fri, 9 Mar 2012 23:14:15 +0100 Subject: [PATCH 2/2] no == true needed Signed-off-by: Nico Schottelius --- lib/cdist/exec/remote.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/cdist/exec/remote.py b/lib/cdist/exec/remote.py index 2e7d9d10..11b8c78e 100644 --- a/lib/cdist/exec/remote.py +++ b/lib/cdist/exec/remote.py @@ -78,7 +78,7 @@ class Remote(object): self.rmdir(destination) command = self._copy.split() # 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]) else: command.extend(["-r", source, self.target_host + ":" + destination])