Browse Source

Исправлена настройка выбранного зеркала

tags/3.6.0_beta8
parent
commit
3986bf1b9b
2 changed files with 21 additions and 17 deletions
  1. +4
    -2
      pym/update/update.py
  2. +17
    -15
      pym/update/utils/cl_update.py

+ 4
- 2
pym/update/update.py View File

@@ -1277,10 +1277,12 @@ class Update(MethodsInterface):
def message_binhost_changed(self):
if self.refresh_binhost:
self.printWARNING(_("Update server was changed to %s") %
self.clVars.Get('cl_update_binhost'))
self.clVars.Get('update.cl_update_binhost'))
self.clVars.Set("update.cl_update_package_cache_set",
Variable.On, force=True)
else:
self.printSUCCESS(_("Update server %s") %
self.clVars.Get('cl_update_binhost'))
self.clVars.Get('update.cl_update_binhost'))
return True

def delete_binhost(self):


+ 17
- 15
pym/update/utils/cl_update.py View File

@@ -144,15 +144,16 @@ def get_synchronization_tasks(object_name):
{'name': 'update_layman',
'message': __("Layman cache update"),
'method': Object('update_layman()'),
'condition': lambda Get: isPkgInstalled(
"app-portage/layman", prefix=Get('cl_chroot_path')),
'condition': lambda Get: (isPkgInstalled(
"app-portage/layman", prefix=Get('cl_chroot_path')) and
Get('cl_chroot_path') != "/"),
'essential': False,
},
{'name': 'sync_other_reps',
'foreach': 'update.cl_update_other_rep_name',
'message': __("Syncing the {eachvar:capitalize} repository"),
'method': Object('syncLaymanRepository(eachvar)'),
'condition': lambda Get: Get('update.cl_update_other_set') == 'on'
'condition': lambda GetBool: GetBool('update.cl_update_other_set')
},
{'name': 'trim_reps',
'foreach': 'update.cl_update_sync_rep',
@@ -375,28 +376,29 @@ class ClUpdateAction(Action):
{'name': 'system_configuration',
'group': __("System configuration"),
'tasks': [
{'name': 'binhost_changed',
'method': 'Update.message_binhost_changed()'
},
{'name': 'revision',
'message': __("Fixing the settings"),
'method': 'Update.applyTemplates(install.cl_source,'
'cl_template_clt_set,True,None,False)',
'condition': lambda Get: (Get('cl_templates_locate') and
'condition': lambda Get, GetBool: (Get('cl_templates_locate') and
(Get('cl_update_world') != "update" or
Get('cl_update_outdate_set') == 'on' or
Get('cl_update_binhost_recheck_set') == 'on' or
Get('cl_update_force_fix_set') == 'on'))
GetBool('cl_update_outdate_set') or
GetBool('cl_update_binhost_recheck_set') or
GetBool('cl_update_force_fix_set') or
GetBool('update.cl_update_package_cache_set')))
},
{'name': 'dispatch_conf',
'message': __("Updating configuration files"),
'method': 'Update.dispatchConf()',
'condition': lambda Get: (Get('cl_dispatch_conf') != 'skip' and
'condition': lambda Get, GetBool: (Get('cl_dispatch_conf') != 'skip' and
Get('cl_update_pretend_set') == 'off' and
(Get('cl_update_binhost_recheck_set') == 'on' or
Get('cl_update_outdate_set') == 'on' or
Get('cl_update_force_fix_set') == 'on'))
},
{'name': 'binhost_changed',
'method': 'Update.message_binhost_changed()'
(GetBool('cl_update_outdate_set') or
GetBool('cl_update_binhost_recheck_set') or
GetBool('cl_update_force_fix_set') or
GetBool('update.cl_update_package_cache_set')))
},
]
}


Loading…
Cancel
Save