Skip to content

Fix COMMA_CACHE restoration #1

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

Open
CommaKia wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix COMMA_CACHE restoration #1

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
8 changes: 8 additions & 0 deletions common/prefix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ def __init__(self, prefix: str = None, clean_dirs_on_exit: bool = True, shared_d
self.msgq_path = os.path.join(Paths.shm_path(), self.prefix)
self.clean_dirs_on_exit = clean_dirs_on_exit
self.shared_download_cache = shared_download_cache
self.original_comma_cache = None

def __enter__(self):
self.original_prefix = os.environ.get('OPENPILOT_PREFIX', None)
self.original_comma_cache = os.environ.get('COMMA_CACHE', None)
os.environ['OPENPILOT_PREFIX'] = self.prefix
try:
os.mkdir(self.msgq_path)
Expand All @@ -38,6 +40,12 @@ def __exit__(self, exc_type, exc_obj, exc_tb):
os.environ['OPENPILOT_PREFIX'] = self.original_prefix
except KeyError:
pass

if self.shared_download_cache:
if self.original_comma_cache is not None:
os.environ['COMMA_CACHE'] = self.original_comma_cache
else:
os.environ.pop('COMMA_CACHE', None)
return False

def clean_dirs(self):
Expand Down