Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
mingwandroid committed Mar 13, 2020
1 parent 7ca33a9 commit 83c9a2d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions conda_build/build.py
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@ def get_files_with_prefix(m, files_in, prefix):
import time
start = time.time()
# It is nonsensical to replace anything in a symlink.
files = [f for f in files_in if not os.path.islink(os.path.join(prefix, f))]
files = sorted([f for f in files_in if not os.path.islink(os.path.join(prefix, f))])
ignore_files = m.ignore_prefix_files()
ignore_types = set()
if not hasattr(ignore_files, "__iter__"):
Expand Down Expand Up @@ -887,8 +887,9 @@ def get_files_with_prefix(m, files_in, prefix):
prefixes_for_file[filename] = set([sm['text'] for sm in match['submatches']])
files_with_prefix_new = []
for (_, mode, filename) in files_with_prefix:
if filename in prefixes_for_file and filename in pfx_matches:
for pfx in prefixes_for_file[filename]:
np = os.path.normpath(filename)
if np in prefixes_for_file and np in pfx_matches:
for pfx in prefixes_for_file[np]:
files_with_prefix_new.append((pfx.decode('utf-8'), mode, filename))
files_with_prefix = files_with_prefix_new
all_matches = {}
Expand Down

0 comments on commit 83c9a2d

Please sign in to comment.