Browse Source

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

tags/3.5.1.1
parent
commit
45e124476a
2 changed files with 3 additions and 2 deletions
  1. +1
    -1
      pym/update/update.py
  2. +2
    -1
      pym/update/utils/cl_update.py

+ 1
- 1
pym/update/update.py View File

@@ -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,


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

@@ -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'))

},


Loading…
Cancel
Save