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

BugFixed upgrade packages

Browse source
This commit is contained in:
Dimitris Zlatanidis 2023-01-14 19:56:11 +02:00
parent c34caa1b66
commit e8e733173e
3 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.txt
View file

@ -1,8 +1,8 @@
4.4.9 - 13/01/2023 4.4.9 - 13/01/2023
Updated: Updated:
- Color highlight for installed packages - Color highlight for installed packages
Fixed: BugFixed:
- Upgarde packages - Upgrade packages (Thanks to marav)
4.4.8 - 12/01/2023 4.4.8 - 12/01/2023
Added: Added:

8
slpkg/main.py
View file

@ -170,15 +170,15 @@ class Argparse:
for package in repo_packages: for package in repo_packages:
for pkg in packages: for pkg in packages:
if pkg in package: if method == 'install' and pkg in package:
repo_ver = SBoQueries(package).version() repo_ver = SBoQueries(package).version()
choices += [(package, repo_ver, False)]
if method == 'upgrade': elif method == 'upgrade' and pkg == package:
repo_ver = SBoQueries(package).version()
pkg = self.utils.is_installed(package) pkg = self.utils.is_installed(package)
inst_ver = self.utils.split_installed_pkg(pkg)[1] inst_ver = self.utils.split_installed_pkg(pkg)[1]
choices += [(package, f'{inst_ver} -> {repo_ver}', True)] choices += [(package, f'{inst_ver} -> {repo_ver}', True)]
else:
choices += [(package, repo_ver, False)]
if not choices: if not choices:
return packages return packages

5
slpkg/upgrade.py
View file

@ -28,10 +28,7 @@ class Upgrade:
for pkg in installed: for pkg in installed:
inst_pkg_name = self.utils.split_installed_pkg(pkg)[0] inst_pkg_name = self.utils.split_installed_pkg(pkg)[0]
if (pkg.endswith(self.configs.sbo_repo_tag) if inst_pkg_name not in black and inst_pkg_name in repo_packages:
and inst_pkg_name not in black):
if inst_pkg_name in repo_packages:
if self.utils.is_repo_version_bigger(inst_pkg_name): if self.utils.is_repo_version_bigger(inst_pkg_name):
requires += Requires(inst_pkg_name).resolve() requires += Requires(inst_pkg_name).resolve()