Browse Source

Исправлна попытка скачивать Packages если binhost пуст

tags/3.5.1_beta4
parent
commit
f60b09185d
2 changed files with 5 additions and 2 deletions
  1. +3
    -2
      pym/update/utils/cl_update.py
  2. +2
    -0
      pym/update/variables/update.py

+ 3
- 2
pym/update/utils/cl_update.py View File

@@ -268,8 +268,9 @@ class ClUpdateAction(Action):
'method': 'Update.download_packages(cl_update_portage_binhost,'
'cl_update_package_cache)',
'condition': lambda Get: (
Get('cl_update_outdate_set') == 'on' or
Get('cl_update_package_cache_set') == 'on')
Get('cl_update_package_cache') and (
Get('cl_update_outdate_set') == 'on' or
Get('cl_update_package_cache_set') == 'on'))
},
# сообщение удачного завершения при обновлении репозиториев
{'name': 'success_syncrep',


+ 2
- 0
pym/update/variables/update.py View File

@@ -1687,6 +1687,8 @@ class VariableClUpdatePackageCache(ReadonlyVariable):
cache_path = "var/cache/edb"
chroot_path = self.Get('cl_chroot_path')
base_url = self.Get('cl_update_portage_binhost')
if not base_url:
return ""
parsed_url = urlparse(base_url)
host = parsed_url.netloc
port = parsed_url.port


Loading…
Cancel
Save