andrius
/
live-bootstrap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Set git_dir/sys_dir/cache_dir statically 

This allows accessing their values without requiring a class instance.
This commit is contained in:
Dor Askayo 2023-01-13 13:15:27 +02:00
parent 938d919503
commit 693d01dc1b
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sysa.py
View File

@ -14,26 +14,30 @@ import tarfile
from lib.sysgeneral import SysGeneral, stage0_arch_map from lib.sysgeneral import SysGeneral, stage0_arch_map
# pylint: disable=consider-using-with # pylint: disable=consider-using-with
# pylint: disable=too-many-instance-attributes
class SysA(SysGeneral): class SysA(SysGeneral):
""" """
Class responsible for preparing sources for System A. Class responsible for preparing sources for System A.
""" """
# pylint: disable=too-many-instance-attributes,too-many-arguments
git_dir = os.path.dirname(os.path.join(__file__))
sys_dir = os.path.join(git_dir, 'sysa')
cache_dir = os.path.join(sys_dir, 'distfiles')
# pylint: disable=too-many-arguments
def __init__(self, arch, preserve_tmp, external_sources, def __init__(self, arch, preserve_tmp, external_sources,
early_preseed, tmpdir, sysb_dir, sysc_dir): early_preseed, tmpdir, sysb_dir, sysc_dir):
self.git_dir = os.path.dirname(os.path.join(__file__))
self.arch = arch self.arch = arch
self.preserve_tmp = preserve_tmp self.preserve_tmp = preserve_tmp
self.early_preseed = early_preseed self.early_preseed = early_preseed
self.sys_dir = os.path.join(self.git_dir, 'sysa')
if tmpdir is None: if tmpdir is None:
self.tmp_dir = os.path.join(self.git_dir, 'tmp') self.tmp_dir = os.path.join(self.git_dir, 'tmp')
else: else:
self.tmp_dir = os.path.join(tmpdir, 'sysa') self.tmp_dir = os.path.join(tmpdir, 'sysa')
self.sysa_dir = os.path.join(self.tmp_dir, 'sysa') self.sysa_dir = os.path.join(self.tmp_dir, 'sysa')
self.base_dir = self.sysa_dir self.base_dir = self.sysa_dir
self.cache_dir = os.path.join(self.sys_dir, 'distfiles')
self.sysb_dir = sysb_dir self.sysb_dir = sysb_dir
self.sysc_dir = sysc_dir self.sysc_dir = sysc_dir
self.external_sources = external_sources self.external_sources = external_sources

7
sysb.py
View File

@ -12,9 +12,10 @@ class SysB(SysGeneral):
""" """
Class responsible for preparing sources for System B. Class responsible for preparing sources for System B.
""" """
git_dir = os.path.dirname(os.path.join(__file__))
sys_dir = os.path.join(git_dir, 'sysb')
def __init__(self, arch, preserve_tmp): def __init__(self, arch, preserve_tmp):
self.git_dir = os.path.dirname(os.path.join(__file__))
self.arch = arch self.arch = arch
self.preserve_tmp = preserve_tmp self.preserve_tmp = preserve_tmp
self.sys_dir = os.path.join(self.git_dir, 'sysb')

6
sysc.py
View File

@ -18,16 +18,16 @@ class SysC(SysGeneral):
Class responsible for preparing sources for System C. Class responsible for preparing sources for System C.
""" """
git_dir = os.path.dirname(os.path.join(__file__))
sys_dir = os.path.join(git_dir, 'sysc')
cache_dir = os.path.join(sys_dir, 'distfiles')
dev_name = None dev_name = None
def __init__(self, arch, preserve_tmp, tmpdir, external_sources): def __init__(self, arch, preserve_tmp, tmpdir, external_sources):
self.git_dir = os.path.dirname(os.path.join(__file__))
self.arch = arch self.arch = arch
self.preserve_tmp = preserve_tmp self.preserve_tmp = preserve_tmp
self.external_sources = external_sources self.external_sources = external_sources
self.sys_dir = os.path.join(self.git_dir, 'sysc')
self.cache_dir = os.path.join(self.sys_dir, 'distfiles')
if tmpdir is None: if tmpdir is None:
self.tmp_dir = os.path.join(self.sys_dir, 'tmp') self.tmp_dir = os.path.join(self.sys_dir, 'tmp')
else: else: