Улучшена работа с репозиториями

master3.4
parent c1034ee4f9
commit c0e669c4dc

@ -299,7 +299,8 @@ class Builder(Update):
def syncRepositories(self, repname, clean_on_error=True): def syncRepositories(self, repname, clean_on_error=True):
with self.clVars.useDefaultModule("update"): with self.clVars.useDefaultModule("update"):
return super(Builder, self).syncRepositories(repname) return super(Builder, self).syncRepositories(
repname, clean_on_error=clean_on_error)
def _regenCache_process(self, progname, repname, cpu_num): def _regenCache_process(self, progname, repname, cpu_num):
chroot_path = self.clVars.Get('builder.cl_builder_path') chroot_path = self.clVars.Get('builder.cl_builder_path')
@ -1314,3 +1315,4 @@ class Builder(Update):
clVars.close() clVars.close()
self.endTask() self.endTask()
return True return True

@ -104,6 +104,15 @@ class ClBuilderImageAction(Action):
'method': 'Builder.remove_video_drivers(cl_builder_path)', 'method': 'Builder.remove_video_drivers(cl_builder_path)',
'condition': lambda Get: Get('cl_builder_videodrv_set') == 'off' 'condition': lambda Get: Get('cl_builder_videodrv_set') == 'off'
}, },
{'name': 'trim_reps',
'foreach': 'cl_builder_sync_rep',
'message': __("Cleaning the {eachvar:capitalize} "
"repository"),
'method': 'Builder.trimRepositories(eachvar)',
'condition': lambda Get: (
Get('cl_builder_sync_rep') and
Get('update.cl_update_onedepth_set') == 'on')
},
{'name': 'creating_live_image', {'name': 'creating_live_image',
'group': __("Creating live image"), 'group': __("Creating live image"),
'tasks': [ 'tasks': [

@ -141,6 +141,15 @@ class ClBuilderUpdateAction(Action):
'condition': lambda Get: Get( 'condition': lambda Get: Get(
'update.cl_update_other_set') == 'on' 'update.cl_update_other_set') == 'on'
}, },
{'name': 'trim_reps',
'foreach': 'cl_builder_sync_rep',
'message': __("Cleaning the {eachvar:capitalize} "
"repository"),
'method': 'Builder.trimRepositories(eachvar)',
'condition': lambda Get: (
Get('cl_builder_sync_rep') and
Get('update.cl_update_onedepth_set') == 'on')
},
{'name': 'regen_cache', {'name': 'regen_cache',
'foreach': 'cl_builder_sync_overlay_rep', 'foreach': 'cl_builder_sync_overlay_rep',
'essential': False, 'essential': False,

@ -190,7 +190,9 @@ class Wsdl(WsdlBase):
'cl_builder_rebuild_changed_set', 'cl_builder_rebuild_changed_set',
'update.cl_update_skip_rb_set', 'update.cl_update_skip_rb_set',
'update.cl_update_binhost_recheck_set', 'update.cl_update_binhost_recheck_set',
'update.cl_update_onedepth_set',
'update.cl_update_cleanpkg_set', 'update.cl_update_cleanpkg_set',
'update.cl_update_check_rep_set',
'cl_builder_branch_data', 'cl_builder_branch_data',
'cl_templates_locate', 'cl_templates_locate',
'cl_verbose_set', 'cl_verbose_set',
@ -347,11 +349,12 @@ class Wsdl(WsdlBase):
# Включить проприетарные видео драйвера # Включить проприетарные видео драйвера
# Include proprietary video drivers # Include proprietary video drivers
'cl_builder_videodrv_set', 'cl_builder_videodrv_set',
'cl_builder_compress', 'update.cl_update_onedepth_set',
'cl_builder_keep_tree_set', 'cl_builder_keep_tree_set',
'cl_builder_live_set', 'cl_builder_live_set',
'cl_builder_isohybrid_set', 'cl_builder_isohybrid_set',
'cl_builder_prelink_set', 'cl_builder_prelink_set',
'cl_builder_compress',
'cl_templates_locate', 'cl_templates_locate',
'cl_verbose_set', 'cl_verbose_set',
'cl_dispatch_conf'), 'cl_dispatch_conf'),

Loading…
Cancel
Save