Skip to content
Snippets Groups Projects
Commit 6e404d1f authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Stop merging config when symlink points to same file"

parents ed75bf83 2f4b45cd
No related branches found
No related tags found
No related merge requests found
......@@ -119,6 +119,9 @@ class ConfigCollector(object):
if not rule:
continue
sources = map(os.path.realpath, sources)
sources = _dedup(sources)
if rule["strategy"] == 'copy':
copy = {
"src": sources[-1],
......
---
fixes:
- |
Stop merging config when a symlink points to the same file. This
was a common pattern before the merging of kolla config was introduced
and results in duplicated config options.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment