Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
Bezier89 authored Aug 2, 2019
1 parent c150add commit fc2f314
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions conda/core/package_cache_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -501,14 +501,13 @@ def pcrec_matches(pcrec):
matches = pcrec.md5 in (md5, legacy_bz2_md5)
return matches

if md5:
extracted_pcrec = next((
pcrec for pcrec in concat(PackageCacheData(pkgs_dir).query(pref_or_spec)
for pkgs_dir in context.pkgs_dirs)
if pcrec.is_extracted
), None)
if extracted_pcrec and pcrec_matches(extracted_pcrec) and extracted_pcrec.get('url'):
return None, None
extracted_pcrec = next((
pcrec for pcrec in concat(PackageCacheData(pkgs_dir).query(pref_or_spec)
for pkgs_dir in context.pkgs_dirs)
if pcrec.is_extracteda
), None)
if extracted_pcrec and pcrec_matches(extracted_pcrec) and extracted_pcrec.get('url'):
return None, None

# there is no extracted dist that can work, so now we look for tarballs that
# aren't extracted
Expand Down

0 comments on commit fc2f314

Please sign in to comment.