diff --git a/pym/update/utils/cl_update.py b/pym/update/utils/cl_update.py index 077978c..bee75a0 100644 --- a/pym/update/utils/cl_update.py +++ b/pym/update/utils/cl_update.py @@ -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', diff --git a/pym/update/variables/update.py b/pym/update/variables/update.py index 31b1cbe..f2f147f 100644 --- a/pym/update/variables/update.py +++ b/pym/update/variables/update.py @@ -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