Добавлена обработка логикии версии 3.7.3.0 для cl-builder

master 3.7.2.44
root 1 year ago
parent 4bb1f3184b
commit d9f6f0f859

@ -1618,8 +1618,8 @@ class Update(MethodsInterface):
def create_binhost_data(self):
dv = self.clVars
last_ts = dv.Get('cl_update_last_timestamp')
if (not dv.Get('cl_update_binhost_choice') and not dv.GetBool('update.cl_update_binhost_set')) \
or dv.Get('cl_update_binhost_choice') == 'auto':
if (not dv.Get('update.cl_update_binhost_choice') and not dv.GetBool('update.cl_update_binhost_set')) \
or dv.Get('update.cl_update_binhost_choice') == 'auto':
if dv.Get('cl_update_binhost_stable_opt_set'):
binhost_list = dv.Get('cl_update_binhost_list')
else:
@ -1648,6 +1648,12 @@ class Update(MethodsInterface):
@variable_module("update")
def _search_best_binhost(self, binhosts_data, stabilization, ignore_level=False):
try:
if self.clVars.Get("cl_update_binhost_choice"):
self.clVars.Set('update.cl_update_binhost', self.clVars.Get("cl_update_binhost_choice"))
return self.clVars.Get("cl_update_binhost_choice")
except:
pass
if not self.clVars.Get('cl_ebuild_phase'):
logger = self._get_binhost_logger()
if logger:

@ -128,6 +128,7 @@ def get_synchronization_tasks(object_name):
},
{'name': 'sync_reps:update_local_info_binhost',
'method': Object('update_local_info_binhost()'),
'condition': lambda Get: not Get("update.cl_update_binhost_choice")
},
{'name': 'sync_reps:update_binhost_list',
'essential': False,

@ -75,6 +75,7 @@ class ClUpdateProfileAction(Action):
'foreach': 'cl_update_profile_sync_rep',
'message': __("Syncing the {eachvar:capitalize} repository"),
'method': 'Update.syncRepositories(eachvar)',
'condition': lambda Get: Get('cl_update_profile_check_sync')
},
{'name': 'sync_reps:regen_cache',
'foreach': 'cl_update_sync_overlay_rep',

@ -932,6 +932,16 @@ class VariableClUpdateProfileDependUrl(FieldValue, ReadonlyVariable):
self.label = _("URL")
class VariableClUpdateProfileCheckSync(Variable):
urls = 'cl_update_rep_url'
names = 'cl_update_rep_name'
def get(self):
if not self.Get(self.urls) or not self.Get(self.names):
return False
return True
class VariableClUpdateProfileRepName(ReadonlyVariable):
type = "list"
@ -1414,6 +1424,8 @@ class DataVarsUpdateProfile(SimpleDataVars):
VariableClUpdateBinhostStableSet(section="update"),
VariableClUpdateBinhostStableOptSet(section="update"),
VariableClUpdateBinhostRevisionPath(section="update"),
VariableClUpdateRepHosting(section="update"),
VariableClUpdateBinhostSet(section="update"),
)
self['cl_profile_system'] = profile
self['cl_chroot_path'] = chroot_path

Loading…
Cancel
Save