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

Merge branch 'master' into beta

Browse source
This commit is contained in:
Darko Poljak 2020-04-11 20:47:27 +02:00
commit 6802cd990e
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cdist/exec/util.py
View file

@ -22,6 +22,7 @@
import subprocess
import os
from tempfile import TemporaryFile
from collections import OrderedDict
import cdist
import cdist.configuration
@ -199,7 +200,9 @@ def resolve_conf_dirs(configuration, add_conf_dirs):
if add_conf_dirs:
conf_dirs.extend(add_conf_dirs)
conf_dirs = set(conf_dirs)
# Remove duplicates.
conf_dirs = list(OrderedDict.fromkeys(conf_dirs))
return conf_dirs