clean_venv_cache: Limit search to .txt requirements files.

This both avoids examining all the .in files, but also any additional stray
files, which can cause provision errors.

Fixes #13762.
This commit is contained in:
neiljp (Neil Pilgrim) 2020-01-30 01:35:44 +00:00 committed by Tim Abbott
parent 7cc344e554
commit 6ecf41d0bd
1 changed files with 3 additions and 2 deletions

View File

@ -1,5 +1,6 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
import argparse import argparse
import glob
import os import os
import sys import sys
@ -40,8 +41,8 @@ def get_caches_in_use(threshold_days):
# list its requirements subdirectory. # list its requirements subdirectory.
if not os.path.exists(reqs_dir): if not os.path.exists(reqs_dir):
continue continue
for filename in os.listdir(reqs_dir): requirements_files = glob.glob(os.path.join(reqs_dir, "*.txt"))
requirements_file = os.path.join(reqs_dir, filename) for requirements_file in requirements_files:
deps = expand_reqs(requirements_file) deps = expand_reqs(requirements_file)
hash_val = hash_deps(deps) hash_val = hash_deps(deps)
caches_in_use.add(os.path.join(VENV_CACHE_DIR, hash_val)) caches_in_use.add(os.path.join(VENV_CACHE_DIR, hash_val))