From f60b09185dc7973d426968537bb9f9cc8fa681dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Thu, 2 Feb 2017 12:11:28 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0=D1=82=D1=8C=20Packag?= =?UTF-8?q?es=20=D0=B5=D1=81=D0=BB=D0=B8=20binhost=20=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/utils/cl_update.py | 5 +++-- pym/update/variables/update.py | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) 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