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

Merge "Deduplicate before picking merge strategy"

parents 76208da8 786a78d0
No related branches found
No related tags found
No related merge requests found
......@@ -128,14 +128,14 @@ class ConfigCollector(object):
if not os.path.exists(dirname):
missing_directories.add(dirname)
sources = map(os.path.realpath, sources)
sources = _dedup(sources)
rule = self._find_matching_rule(relative_path, sources)
if not rule:
continue
sources = map(os.path.realpath, sources)
sources = _dedup(sources)
if rule["strategy"] == 'copy':
copy = {
"src": sources[-1],
......
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