From 45e124476aa02149bacf33d4792ae979615dc96e 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: Wed, 8 Feb 2017 13:17:49 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=20=D0=B2=D1=8B=D0=B7=D0=BE=D0=B2=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D1=81=D0=B8=D1=81?= =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=8B=20(=D0=BF=D1=80=D0=B8=20=D0=B8=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B8=20--merge-world,=20rebuild-world)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/update/update.py | 2 +- pym/update/utils/cl_update.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 97011d5..5f04736 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -40,7 +40,7 @@ from collections import MutableSet from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError from calculate.lib.utils.portage import (Layman, EmergeLog, - EmergeLogNamedTask, PackageList, + EmergeLogNamedTask, PackageInformation, get_packages_files_directory, get_manifest_files_directory, diff --git a/pym/update/utils/cl_update.py b/pym/update/utils/cl_update.py index 3d49919..0216bac 100644 --- a/pym/update/utils/cl_update.py +++ b/pym/update/utils/cl_update.py @@ -293,7 +293,8 @@ class ClUpdateAction(Action): 'method': 'Update.applyTemplates(install.cl_source,' 'cl_template_clt_set,True,None,False)', 'condition': lambda Get: (Get('cl_templates_locate') and - (Get('cl_update_outdate_set') == 'on' or + (Get('cl_update_world') != "update" or + Get('cl_update_outdate_set') == 'on' or Get('cl_update_force_fix_set') == 'on')) },