diff --git a/sysa.py b/sysa.py index 0ccdd34..f6ec005 100755 --- a/sysa.py +++ b/sysa.py @@ -14,26 +14,30 @@ import tarfile from lib.sysgeneral import SysGeneral, stage0_arch_map # pylint: disable=consider-using-with +# pylint: disable=too-many-instance-attributes class SysA(SysGeneral): """ 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, early_preseed, tmpdir, sysb_dir, sysc_dir): - self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp self.early_preseed = early_preseed - self.sys_dir = os.path.join(self.git_dir, 'sysa') if tmpdir is None: self.tmp_dir = os.path.join(self.git_dir, 'tmp') else: self.tmp_dir = os.path.join(tmpdir, 'sysa') self.sysa_dir = os.path.join(self.tmp_dir, 'sysa') self.base_dir = self.sysa_dir - self.cache_dir = os.path.join(self.sys_dir, 'distfiles') + self.sysb_dir = sysb_dir self.sysc_dir = sysc_dir self.external_sources = external_sources diff --git a/sysb.py b/sysb.py index 3f02f48..d4752f4 100755 --- a/sysb.py +++ b/sysb.py @@ -12,9 +12,10 @@ class SysB(SysGeneral): """ 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): - self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp - - self.sys_dir = os.path.join(self.git_dir, 'sysb') diff --git a/sysc.py b/sysc.py index 5bbd87c..b59b259 100755 --- a/sysc.py +++ b/sysc.py @@ -18,16 +18,16 @@ class SysC(SysGeneral): 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 def __init__(self, arch, preserve_tmp, tmpdir, external_sources): - self.git_dir = os.path.dirname(os.path.join(__file__)) self.arch = arch self.preserve_tmp = preserve_tmp 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: self.tmp_dir = os.path.join(self.sys_dir, 'tmp') else: