fancsali/cdist-backup
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Expand and split by consecutive require delimiters

Browse source 
Resolves #832.
This commit is contained in:
Darko Poljak 2020-08-22 19:53:42 +02:00
commit c17541f24c
3 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cdist/emulator.py
View file

@ -25,6 +25,7 @@ import argparse
import logging
import os
import sys
import re
import cdist
from cdist import core
@ -389,12 +390,15 @@ class Emulator:
if "require" in self.env:
requirements = self.env['require']
self.log.debug("reqs = " + requirements)
for requirement in requirements.split(" "):
for requirement in self._parse_require(requirements):
# Ignore empty fields - probably the only field anyway
if len(requirement) == 0:
continue
self.record_requirement(requirement)
def _parse_require(self, require):
return re.split(r'[ \t\n]+', require)
def record_auto_requirements(self):
"""An object shall automatically depend on all objects that it
defined in it's type manifest.