Skip to content

Commit

Permalink
Deduplicate before picking merge strategy
Browse files Browse the repository at this point in the history
I missed this when I refactored the code to fallback
to templating. We need to deduplicate before picking
the strategy for the fallback to work for symlinked files.

Change-Id: Iddd6c90a6daa41e1d1cdaa6b598491792c13394d
Closes-Bug: #2042689
(cherry picked from commit 786a78d)
  • Loading branch information
jovial committed Dec 1, 2023
1 parent 77da186 commit f84a33c
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 f84a33c

Please sign in to comment.