Skip to content

Commit

Permalink
Merge pull request #212 from stackhpc/bugfix/2023.1/kolla-merge
Browse files Browse the repository at this point in the history
Deduplicate before picking merge strategy
  • Loading branch information
markgoddard authored Dec 4, 2023
2 parents 77da186 + f84a33c commit 543158f
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -128,14 +128,14 @@ def partition_into_actions(self):
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],
Expand Down

0 comments on commit 543158f

Please sign in to comment.