From 44258d78aa77eb640956cab48d23f28c8fb0c2bd Mon Sep 17 00:00:00 2001 From: debianpepper Date: Tue, 29 Aug 2023 13:45:02 +0900 Subject: [PATCH] Updated Signed-off-by: debianpepper --- python_modules/build_iso.py | 12 +++++++----- python_modules/conf.py | 11 +++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index a48e9d4c..d1fe57fa 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -62,8 +62,6 @@ class BuildXfce: ) os.system(run_cmd) print("INFO: ISO build has completed successfully") - - def debian_build(self): @@ -103,12 +101,16 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_run_build) + bld_list = collections.deque(conf.shared_finish_build) list_size = len(bld_list) for _ in range(list_size): i = bld_list.popleft() execute = i + '()' exec(execute) + print('=' * term_size.columns) + print("INFO: ISO is ready for usage.") + print('=' * term_size.columns) + elif self.sarch == '_32': current_working_directory = os.getcwd() print('=' * term_size.columns) @@ -157,7 +159,7 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_run_build) + bld_list = collections.deque(conf.shared_finish_build) list_size = len(bld_list) for _ in range(list_size): i = bld_list.popleft() @@ -196,7 +198,7 @@ class BuildXfce: current_working_directory ) print('=' * term_size.columns) - bld_list = collections.deque(conf.shared_run_build) + bld_list = collections.deque(conf.shared_finish_build) list_size = len(bld_list) for _ in range(list_size): i = bld_list.popleft() diff --git a/python_modules/conf.py b/python_modules/conf.py index 764b31f2..e9a2c46f 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -62,12 +62,11 @@ buildarm_xfce_build = (shared_setup_cmds + setup_xfce_cmds + ) ## These run the actual build process. -shared_run_build = ('self.run_build', - 'finish_cleanup.make_check_sum', - 'finish_cleanup.copy_iso_file_nightly_deb64', - 'finish_cleanup.copy_iso_file_prod_deb64', - 'finish_cleanup.kill_old_iso' - ) +shared_finish_build = ('finish_cleanup.make_check_sum', + 'finish_cleanup.copy_iso_file_nightly_deb64', + 'finish_cleanup.copy_iso_file_prod_deb64', + 'finish_cleanup.kill_old_iso' + )