Исправлен вызов исправления настроек системы (при использовании --merge-world, rebuild-world)

master-3.5
parent 8d38cfe0c0
commit 45e124476a

@ -40,7 +40,7 @@ from collections import MutableSet
from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError
from calculate.lib.utils.portage import (Layman, EmergeLog, from calculate.lib.utils.portage import (Layman, EmergeLog,
EmergeLogNamedTask, PackageList, EmergeLogNamedTask,
PackageInformation, PackageInformation,
get_packages_files_directory, get_packages_files_directory,
get_manifest_files_directory, get_manifest_files_directory,

@ -293,7 +293,8 @@ class ClUpdateAction(Action):
'method': 'Update.applyTemplates(install.cl_source,' 'method': 'Update.applyTemplates(install.cl_source,'
'cl_template_clt_set,True,None,False)', 'cl_template_clt_set,True,None,False)',
'condition': lambda Get: (Get('cl_templates_locate') and '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')) Get('cl_update_force_fix_set') == 'on'))
}, },

Loading…
Cancel
Save