From d8b51795c1223d7ef502975f3c69e3790b432bcb Mon Sep 17 00:00:00 2001 From: debianpepper Date: Tue, 12 Dec 2023 21:26:34 +0900 Subject: [PATCH] Testing: Update Modules Signed-off-by: debianpepper --- python_modules/build_iso.py | 31 +++++++++++++++++++++++-------- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index 7a7c9448..9d10e60b 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -87,14 +87,29 @@ class BuildXfce: """ Helper for the xfce desktop shared for all builds """ - arch_suffix = self.sarch[1:] - cmd_list = None - if arch_suffix in ["64", "32", "arm"]: - cmd_list = getattr(conf, f"build{arch_suffix}_xfce_build", []) - for command in cmd_list: - execute = command + '()' + if self.sarch[1:] == "64": + cmd_list = collections.deque(conf.build64_xfce_build) + list_size = len(cmd_list) + for _ in range(list_size): + i = cmd_list.popleft() + execute = i + '()' exec(execute) - return cmd_list + elif self.sarch[1:] == "32": + cmd_list = collections.deque(conf.build32_xfce_build) + list_size = len(cmd_list) + for _ in range(list_size): + i = cmd_list.popleft() + execute = i + '()' + exec(execute) + elif self.sarch[1:] == "arm": + cmd_list = collections.deque(conf.buildarm_xfce_build) + list_size = len(cmd_list) + for _ in range(list_size): + i = cmd_list.popleft() + execute = i + '()' + exec(execute) + else: + cmd_list = None def cleanup_helper(self): @@ -102,7 +117,7 @@ class BuildXfce: finish_cleanup.make_check_sum() finish_cleanup.check_build_type_xfce() finish_cleanup.kill_old_iso() - + def build_system(self): """ Builds the ISO XFCE Depedning on the Arch """