From e19c1bb1e0072a4bfd6ec64ada2d3c4fab1ac064 Mon Sep 17 00:00:00 2001
From: Steven Armstrong <steven@icarus.ethz.ch>
Date: Fri, 10 Apr 2020 21:50:39 +0200
Subject: [PATCH] remove duplicates from conf dirs while preserving order
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
---
cdist/exec/util.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cdist/exec/util.py b/cdist/exec/util.py
index 9787f431..e3be2235 100644
--- a/cdist/exec/util.py
+++ b/cdist/exec/util.py
@@ -199,7 +199,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(dict.fromkeys(conf_dirs))
return conf_dirs