spalencsar/bearhub
1
0
Fork 0
mirror of https://github.com/spalencsar/bearhub.git synced 2026-07-09 09:54:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

[fix][arch] staging regression: not considering settings related to AUR and repositories are enabled/disabled

Browse Source
This commit is contained in:
Vinícius Moreira
2020-05-11 17:04:51 -03:00
parent adb488efbd
commit fb90bd2694
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bauh/gems/arch/controller.py
View File

@@ -506,9 +506,11 @@ class ArchManager(SoftwareManager):
if repo_pkgs is not None: if repo_pkgs is not None:
repo_pkgs[pkg] = installed['not_signed'][pkg] repo_pkgs[pkg] = installed['not_signed'][pkg]
del installed['not_signed'][pkg] if arch_config['aur']:
del installed['not_signed'][pkg]
aur_pkgs = installed['not_signed'] if arch_config['aur']:
aur_pkgs = installed['not_signed']
pkgs = [] pkgs = []
if repo_pkgs or aur_pkgs: if repo_pkgs or aur_pkgs:

2
bauh/gems/arch/worker.py
View File

@@ -105,7 +105,7 @@ class ArchDiskCacheUpdater(Thread):
self.task_man.update_progress(self.task_id, 0, self.i18n['arch.task.disk_cache.reading']) self.task_man.update_progress(self.task_id, 0, self.i18n['arch.task.disk_cache.reading'])
saved = 0 saved = 0
pkgs = {p.name: p for p in installed if not os.path.exists(p.get_disk_cache_path())} pkgs = {p.name: p for p in installed if ((self.aur and p.repository == 'aur') or (self.repositories and p.repository != 'aur')) and not os.path.exists(p.get_disk_cache_path())}
self.to_index = len(pkgs) self.to_index = len(pkgs)
self.progress = self.to_index * 2 self.progress = self.to_index * 2