Merge branch 'bugfix_override_and_order' of https://github.com/dheule/cdist

cdist/emulator.py

@@ -189,7 +189,8 @@ class Emulator(object):
     def record_requirements(self):
         """record requirements"""
 
-        if "CDIST_ORDER_DEPENDENCY" in self.env:
+        # Inject the predecessor, but not if its an override (this would leed to an circular dependency)
+        if "CDIST_ORDER_DEPENDENCY" in self.env and not 'CDIST_OVERRIDE' in self.env:
             # load object name created bevor this one from typeorder file ...
             with open(self.typeorder_path, 'r') as typecreationfile:
                 typecreationorder = typecreationfile.readlines()

docs/man/cdist-reference.text.sh

@@ -236,7 +236,7 @@ The following environment variables influence the behaviour of cdist:
 require::
     Setup dependencies between objects (see cdist-manifest(7))
 
-CDIST_ALLOW_OVERRIDE::
+CDIST_OVERRIDE::
     Allow overwriting type parameters (see cdist-manifest(7))
 
 CDIST_ORDER_DEPENDENCY::

docs/man/man7/cdist-manifest.text

@@ -152,6 +152,10 @@ ATTENTION: Only use this feature if you are 100% sure in which order
 cdist encounter the affected objects, otherwhise this results 
 into an undefined situation. 
 
+If CDIST_OVERRIDE and CDIST_ORDER_DEPENDENCY is set for an object,
+CDIST_ORDER_DEPENDENCY will be ignored, because adding a dependency in case of
+overrides would result in circular dependencies, which is an error.
+
 THIS IS A BETA FEATURE AND MAY BE REMOVED OR CHANGED AT ANY TIME.