Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2025-02-11 20:48:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fixed upgradeable packages

Browse source
This commit is contained in:
Dimitris Zlatanidis 2023-02-27 20:47:49 +02:00
parent 5c3432feed
commit 59a78874aa
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
slpkg/slackbuild.py
View file

@ -123,7 +123,7 @@ class Slackbuilds(Configs):
def is_for_skipped(self, sbo): def is_for_skipped(self, sbo):
""" Condition to check if slackbuild is for skipped. """ """ Condition to check if slackbuild is for skipped. """
return (not self.utils.is_installed(sbo, self.file_pattern) or return (not self.utils.is_installed(sbo, self.file_pattern) or
self.utils.is_repo_version_bigger(sbo, self.file_pattern) or self.utils.is_package_upgradeable(sbo, self.file_pattern) or
self.mode == 'build' or self.utils.is_option(self.flag_reinstall, self.flags)) self.mode == 'build' or self.utils.is_option(self.flag_reinstall, self.flags))
def download_slackbuilds(self): def download_slackbuilds(self):
@ -331,9 +331,15 @@ class Slackbuilds(Configs):
for package in dependencies: for package in dependencies:
status = False status = False
repo_ver = SBoQueries(package).version() repo_ver = SBoQueries(package).version()
self.utils.is_repo_version_bigger(package, self.file_pattern) self.utils.is_package_upgradeable(package, self.file_pattern)
if self.utils.is_repo_version_bigger(package, self.file_pattern): if self.mode == 'upgrade' and self.utils.is_package_upgradeable(package, self.file_pattern):
status = True
if self.mode == 'install' and not self.utils.is_installed(package, self.file_pattern):
status = True
if self.mode == 'install' and self.utils.is_package_upgradeable(package, self.file_pattern):
status = True status = True
choices += [(package, repo_ver, status)] choices += [(package, repo_ver, status)]

2
slpkg/upgrade.py
View file

@ -29,7 +29,7 @@ class Upgrade(Configs, Utilities):
if inst_pkg_name not in black and inst_pkg_name in repo_packages: if inst_pkg_name not in black and inst_pkg_name in repo_packages:
if self.is_repo_version_bigger(inst_pkg_name, self.file_pattern): if self.is_package_upgradeable(inst_pkg_name, self.file_pattern):
requires += Requires(inst_pkg_name).resolve() requires += Requires(inst_pkg_name).resolve()
upgrade.append(inst_pkg_name) upgrade.append(inst_pkg_name)

2
slpkg/utilities.py
View file

@ -90,7 +90,7 @@ class Utilities:
time.strftime(f'[{self.cyan}%H:%M:%S{self.endc}]', time.strftime(f'[{self.cyan}%H:%M:%S{self.endc}]',
time.gmtime(elapsed_time))) time.gmtime(elapsed_time)))
def is_repo_version_bigger(self, package: str, file_pattern: str) -> bool: def is_package_upgradeable(self, package: str, file_pattern: str) -> bool:
""" Compare two versions. """ """ Compare two versions. """
installed = self.is_installed(package, file_pattern) installed = self.is_installed(package, file_pattern)
if installed: if installed:

4
slpkg/views/views.py
View file

@ -192,8 +192,8 @@ class ViewMessage(Configs):
install += 1 install += 1
elif installed and self.utils.is_option(self.flag_reinstall, self.flags): elif installed and self.utils.is_option(self.flag_reinstall, self.flags):
upgrade += 1 upgrade += 1
elif (installed and self.utils.is_repo_version_bigger(sbo, self.file_pattern) and elif (installed and self.utils.is_package_upgradeable(sbo, self.file_pattern) and
self.utils.is_option(self.flag_reinstall, self.flags)): self.utils.is_option(self.flag_reinstall, self.flags)):
upgrade += 1 upgrade += 1
elif installed and option == 'remove': elif installed and option == 'remove':
remove += 1 remove += 1