mark/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Nico Schottelius 2014-02-12 16:56:30 +01:00
commit 01a3f7c0b7
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
cdist/emulator.py
View file

@ -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()