Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-12-27 09:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bugfixes to install packages #180

Browse source
This commit is contained in:
Dimitris Zlatanidis 2024-03-31 18:01:30 +03:00
parent 2c693bceb4
commit ed769871a4
3 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog.txt
View file

@ -7,6 +7,7 @@
- Bugfixes:
* Check for custom upgrade packages (Thanks to Marav)
* Fixed to install packages when run upgrade command #180
### 5.0.1 - 29/03/2024
- Updated:

11
slpkg/binaries/install.py
View file

@ -42,7 +42,6 @@ class Packages(Configs):
self.install_order: list = []
self.binary_packages: list = []
self.skipped_packages: list = []
self.slackware_command: str = self.installpkg
self.progress_message: str = f'{self.cyan}Installing{self.endc}'
self.option_for_reinstall: bool = self.utils.is_option(
@ -69,7 +68,6 @@ class Packages(Configs):
self.view.skipping_packages(self.skipped_packages)
self.crating_the_package_urls_list()
self.checksum_binary_packages()
self.set_slackware_command()
self.set_progress_message()
self.install_packages()
elapsed_time: float = time.time() - start
@ -155,7 +153,10 @@ class Packages(Configs):
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}'
command: str = f'{self.installpkg} {self.tmp_slpkg}/{package}'
if self.option_for_reinstall:
command: str = f'{self.reinstall} {self.tmp_slpkg}/{package}'
self.multi_proc.process_and_log(command, package, self.progress_message)
name: str = self.utils.split_package(package)['name']
self.write_deps_log(name)
@ -180,10 +181,6 @@ class Packages(Configs):
if self.mode == 'upgrade' or self.option_for_reinstall:
self.progress_message: str = f'{self.cyan}Upgrading{self.endc}'
def set_slackware_command(self) -> None:
if self.mode == 'upgrade' or self.option_for_reinstall:
self.slackware_command: str = self.reinstall
def choose_package_dependencies(self) -> None:
if self.dependencies and self.dialog:
height: int = 10

12
slpkg/sbos/slackbuild.py
View file

@ -48,7 +48,6 @@ class Slackbuilds(Configs):
self.dependencies: list = []
self.skipped_packages: list = []
self.asc_files: list = []
self.slackware_command: str = self.installpkg
self.progress_message: str = f'{self.cyan}Installing{self.endc}'
self.option_for_reinstall: bool = self.utils.is_option(
@ -75,7 +74,6 @@ class Slackbuilds(Configs):
self.view.skipping_packages(self.skipped_packages)
self.prepare_slackbuilds_for_build()
self.download_the_sources()
self.set_slackware_command()
self.set_progress_message()
self.build_and_install_the_slackbuilds()
elapsed_time: float = time.time() - start
@ -205,7 +203,11 @@ class Slackbuilds(Configs):
def install_package(self, name: str) -> None:
package: str = self.find_package_for_install(name)
command: str = f'{self.slackware_command} {self.tmp_path}/{package}'
command: str = f'{self.installpkg} {self.tmp_path}/{package}'
if self.option_for_reinstall:
command: str = f'{self.reinstall} {self.tmp_path}/{package}'
self.multi_proc.process_and_log(command, package, self.progress_message)
self.write_deps_log(name)
@ -247,10 +249,6 @@ class Slackbuilds(Configs):
if self.mode == 'upgrade' or self.option_for_reinstall:
self.progress_message: str = f'{self.cyan}Upgrading{self.endc}'
def set_slackware_command(self) -> None:
if self.mode == 'upgrade' or self.option_for_reinstall:
self.slackware_command: str = self.reinstall
def set_makeflags(self) -> None:
os.environ['MAKEFLAGS'] = f'-j {self.makeflags}'