Skip to content

Add back looking for /etc/stashcache/caches.json by default #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
djw8605 merged 1 commit into from
May 14, 2020
Merged

Add back looking for /etc/stashcache/caches.json by default #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions stashcp/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,10 +845,15 @@ def main():
get_best_stashcache()
# does not return

if 'CACHES_JSON' in os.environ:
if args.caches_json:
caches_json_location = args.caches_json
elif 'CACHES_JSON' in os.environ:
caches_json_location = os.environ['CACHES_JSON']
else:
caches_json_location = args.caches_json
prefix = os.environ.get("OSG_LOCATION", "/")
caches_file = os.path.join(prefix, "etc/stashcache/caches.json")
if os.path.exists(caches_file):
caches_json_location = caches_file

cache_list_name = args.cache_list_name
if args.closest or args.list_names:
Expand Down