diff --git a/slpkg/binaries/install.py b/slpkg/binaries/install.py index fe3d8438..78beb35d 100644 --- a/slpkg/binaries/install.py +++ b/slpkg/binaries/install.py @@ -141,8 +141,13 @@ class Packages(Configs): self.check_md5.md5sum(self.tmp_slpkg, package, pkg_checksum) def install_packages(self) -> None: + # Remove old slpkg.log file. + if self.slpkg_log_file.is_file(): + self.slpkg_log_file.unlink() + if self.binary_packages: print(f'Started the processing of ({self.cyan}{len(self.binary_packages)}{self.endc}) packages:\n') + for package in self.binary_packages: command: str = f'{self.slackware_command} {self.tmp_slpkg}/{package}' self.multi_proc.run(command, package, self.progress_message) diff --git a/slpkg/multi_process.py b/slpkg/multi_process.py index bf38eb62..cd0834cd 100644 --- a/slpkg/multi_process.py +++ b/slpkg/multi_process.py @@ -62,8 +62,8 @@ class MultiProcess(Configs): Build the package and write a log file. Args: command: The command of process - stdout: - stderr: + stdout: Captured stdout from the child process. + stderr: Captured stderr from the child process. Returns: None. """ @@ -75,9 +75,9 @@ class MultiProcess(Configs): # Write the timestamp at the head of the log file. with open(self.slpkg_log_file, 'a') as log: - log.write(len(head_message) * '=' + '\n') + log.write(f"{len(head_message) * '='}\n") log.write(f'{head_message}\n') - log.write(len(head_message) * '=' + '\n\n') + log.write(f"{len(head_message) * '='}\n") # Write the process to the log file and to the terminal. with process.stdout as output: @@ -89,9 +89,9 @@ class MultiProcess(Configs): # Write the bottom of the log file. with open(self.slpkg_log_file, 'a') as log: - log.write('\n' + len(bottom_message) * '=' + '\n') + log.write(f"\n{len(bottom_message) * '='}\n") log.write(f'{bottom_message}\n') - log.write(len(bottom_message) * '=') + log.write(f"{len(bottom_message) * '='}\n\n") process.wait() # Wait for the process to finish diff --git a/slpkg/remove_packages.py b/slpkg/remove_packages.py index cea45660..ca52b35f 100644 --- a/slpkg/remove_packages.py +++ b/slpkg/remove_packages.py @@ -88,6 +88,10 @@ class RemovePackages(Configs): self.packages_for_remove.append(installed) def remove_packages(self) -> None: + # Remove old slpkg.log file. + if self.slpkg_log_file.is_file(): + self.slpkg_log_file.unlink() + print(f'Started of removing total ({self.cyan}{len(self.packages_for_remove)}{self.endc}) packages:\n') for package in self.packages_for_remove: command: str = f'{self.removepkg} {package}' diff --git a/slpkg/sbos/slackbuild.py b/slpkg/sbos/slackbuild.py index 98a7c9fa..e0ae0c6b 100644 --- a/slpkg/sbos/slackbuild.py +++ b/slpkg/sbos/slackbuild.py @@ -176,8 +176,13 @@ class Slackbuilds(Configs): self.check_md5.md5sum(path, source, checksum) def build_and_install_the_slackbuilds(self) -> None: + # Remove old slpkg.log file. + if self.slpkg_log_file.is_file(): + self.slpkg_log_file.unlink() + if self.install_order: print(f'Started the processing of ({self.cyan}{len(self.install_order)}{self.endc}) packages:\n') + for sbo in self.install_order: if self.continue_build_or_install(sbo): self.patch_slackbuild_tag(sbo)