tabulon/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Pull requests 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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cdist/conf/explorer/init
View file

@ -221,6 +221,7 @@ check_systemstarter() {
check_sysvinit() ( check_sysvinit() (
init_path=${1:-/sbin/init} init_path=${1:-/sbin/init}
test -x "${init_path}" || return 1
grep -q 'INIT_VERSION=sysvinit-[0-9.]*' "${init_path}" || return 1 grep -q 'INIT_VERSION=sysvinit-[0-9.]*' "${init_path}" || return 1
# It is quite common to use SysVinit to stack other init systemd # It is quite common to use SysVinit to stack other init systemd

5
cdist/exec/util.py
View file

@ -22,6 +22,7 @@
import subprocess import subprocess
import os import os
from tempfile import TemporaryFile from tempfile import TemporaryFile
from collections import OrderedDict
import cdist import cdist
import cdist.configuration import cdist.configuration
@ -199,7 +200,9 @@ def resolve_conf_dirs(configuration, add_conf_dirs):
if add_conf_dirs: if add_conf_dirs:
conf_dirs.extend(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 return conf_dirs

4
docs/changelog
View file

@ -5,6 +5,10 @@ next:
* Core: Add trigger functionality (Nico Schottelius, Darko Poljak) * Core: Add trigger functionality (Nico Schottelius, Darko Poljak)
* Core: Implement core support for python types (Darko Poljak) * Core: Implement core support for python types (Darko Poljak)
6.5.4: 2020-04-11
* Explorer init: Do not grep on non-existent init (Steven Armstrong)
* Core: Bugfix to preserve conf dirs order (Steven Armstrong)
6.5.3: 2020-04-03 6.5.3: 2020-04-03
* Type __cron: Make non parallel due to race condition (Nico Schottelius) * Type __cron: Make non parallel due to race condition (Nico Schottelius)
* Type __pyvenv: Use python3 -m venv on Alpine (Nico Schottelius) * Type __pyvenv: Use python3 -m venv on Alpine (Nico Schottelius)