Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-11-16 07:47:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed for upgrade

Browse source 
Signed-off-by: Dimitris Zlatanidis <d.zlatanidis@gmail.com>
This commit is contained in:
Dimitris Zlatanidis 2024-08-22 19:30:00 +03:00
parent 524252b2c9
commit 841a81b7d0
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog.txt
View file

@ -1,5 +1,10 @@
## slpkg - ChangeLog ## slpkg - ChangeLog
### 5.1.2 - 22/08/2024
- Fixed:
* Fixed for upgrade when new_packages method is enabled
### 5.1.1 - 22/07/2024 ### 5.1.1 - 22/07/2024
- Added: - Added:

7
slpkg/upgrade.py
View file

@ -32,7 +32,6 @@ class Upgrade(Configs): # pylint: disable=[R0902]
self.sum_upgrade: int = 0 self.sum_upgrade: int = 0
self.sum_removed: int = 0 self.sum_removed: int = 0
self.sum_added: int = 0 self.sum_added: int = 0
self.installed_names: list = []
self.installed_packages: list = [] self.installed_packages: list = []
self.kernel_ver: str = platform.uname()[2] self.kernel_ver: str = platform.uname()[2]
@ -64,10 +63,8 @@ class Upgrade(Configs): # pylint: disable=[R0902]
extra_package: str = extra_repo[name]['package'] extra_package: str = extra_repo[name]['package']
if extra_package[:-4] != package: if extra_package[:-4] != package:
self.installed_packages.append(Path(package)) self.installed_packages.append(Path(package))
self.installed_names.append(name)
else: else:
self.installed_packages.append(Path(package)) self.installed_packages.append(Path(package))
self.installed_names.append(name)
else: else:
repo_tag: str = self.repos.repositories[repository]['repo_tag'] repo_tag: str = self.repos.repositories[repository]['repo_tag']
self.installed_packages: list = list(self.log_packages.glob(f'*{repo_tag}')) self.installed_packages: list = list(self.log_packages.glob(f'*{repo_tag}'))
@ -92,7 +89,6 @@ class Upgrade(Configs): # pylint: disable=[R0902]
if self.repository in self.repos.new_packages: if self.repository in self.repos.new_packages:
for name in self.data.keys(): for name in self.data.keys():
if not self.utils.is_package_installed(name): if not self.utils.is_package_installed(name):
# if name not in self.installed_names:
yield name yield name
def is_package_upgradeable(self, installed: str) -> bool: # pylint: disable=[R0911] def is_package_upgradeable(self, installed: str) -> bool: # pylint: disable=[R0911]
@ -220,8 +216,7 @@ class Upgrade(Configs): # pylint: disable=[R0902]
if repo in self.repos.new_packages: if repo in self.repos.new_packages:
for name in data.keys(): for name in data.keys():
# if not self.utils.is_package_installed(name): if not self.utils.is_package_installed(name):
if name not in self.installed_names:
self.id += 1 self.id += 1
self.sum_added += 1 self.sum_added += 1
repo_version: str = data[name]['version'] repo_version: str = data[name]['version']