diff options
| author | Alejandro Sirgo Rica <asirgo@soleta.eu> | 2024-05-27 11:59:25 +0200 |
|---|---|---|
| committer | Alejandro Sirgo Rica <asirgo@soleta.eu> | 2024-05-30 17:22:23 +0200 |
| commit | 9a5e83ea1abfd8e22d8531d343ffd2c85d95b351 (patch) | |
| tree | fa0745f79874aaec98d49c4c5ed43048c81e4afc /src/live | |
| parent | dd003e688fad500bb40210d64b7b96e1ea63b8fa (diff) | |
src: stop using hardcoded paths to cache image directory
Use the constant OG_CACHE_IMAGE_PATH from cache.py to obtain the
location of the directory where images are stored.
This way the path can be changed from one single point.
Diffstat (limited to 'src/live')
| -rw-r--r-- | src/live/ogOperations.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/live/ogOperations.py b/src/live/ogOperations.py index e8a3b40..485b4d7 100644 --- a/src/live/ogOperations.py +++ b/src/live/ogOperations.py @@ -39,7 +39,6 @@ from src.log import OgError OG_SHELL = '/bin/bash' -OG_CACHE_PATH = '/opt/opengnsys/cache/opt/opengnsys/images' class OgLiveOperations: def __init__(self, config): @@ -181,7 +180,7 @@ class OgLiveOperations: Implies a unicast transfer. Does not use tiptorrent. """ src = f'/opt/opengnsys/images/{image_name}.img' - dst = f'/opt/opengnsys/cache/opt/opengnsys/images/{image_name}.img' + dst = f'{OG_CACHE_IMAGE_PATH}{image_name}.img' try: r = shutil.copy(src, dst) tip_write_csum(image_name) @@ -194,7 +193,7 @@ class OgLiveOperations: raise OgError(f'Cannot change repository to {repo}') if cache: - image_path = f'/opt/opengnsys/cache/opt/opengnsys/images/{name}.img' + image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img' if (not os.path.exists(image_path) or not tip_check_csum(repo, name)): self._copy_image_to_cache(name) @@ -203,10 +202,10 @@ class OgLiveOperations: self._restore_image(image_path, devpath) def _restore_image_tiptorrent(self, repo, name, devpath): - if not os.path.exists(OG_CACHE_PATH): + if not os.path.exists(OG_CACHE_IMAGE_PATH): raise OgError('No cache partition is mounted') - image_path = f'/opt/opengnsys/cache/opt/opengnsys/images/{name}.img' + image_path = f'{OG_CACHE_IMAGE_PATH}{name}.img' try: if (not os.path.exists(image_path) or not tip_check_csum(repo, name)): tip_client_get(repo, name) |