From c0e669c4dc6cd2a37d1de845cda1a788cf5ab9b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Fri, 18 Dec 2015 14:19:04 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20=D1=81=20=D1=80?= =?UTF-8?q?=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B8=D1=8F?= =?UTF-8?q?=D0=BC=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/builder.py | 4 +++- pym/builder/utils/cl_builder_image.py | 9 +++++++++ pym/builder/utils/cl_builder_update.py | 9 +++++++++ pym/builder/wsdl_builder.py | 5 ++++- 4 files changed, 25 insertions(+), 2 deletions(-) diff --git a/pym/builder/builder.py b/pym/builder/builder.py index 14abdad..220223b 100644 --- a/pym/builder/builder.py +++ b/pym/builder/builder.py @@ -299,7 +299,8 @@ class Builder(Update): def syncRepositories(self, repname, clean_on_error=True): 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): chroot_path = self.clVars.Get('builder.cl_builder_path') @@ -1314,3 +1315,4 @@ class Builder(Update): clVars.close() self.endTask() return True + diff --git a/pym/builder/utils/cl_builder_image.py b/pym/builder/utils/cl_builder_image.py index c670be5..16dbc06 100644 --- a/pym/builder/utils/cl_builder_image.py +++ b/pym/builder/utils/cl_builder_image.py @@ -104,6 +104,15 @@ class ClBuilderImageAction(Action): 'method': 'Builder.remove_video_drivers(cl_builder_path)', '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', 'group': __("Creating live image"), 'tasks': [ diff --git a/pym/builder/utils/cl_builder_update.py b/pym/builder/utils/cl_builder_update.py index c67d8d0..ab4e623 100644 --- a/pym/builder/utils/cl_builder_update.py +++ b/pym/builder/utils/cl_builder_update.py @@ -141,6 +141,15 @@ class ClBuilderUpdateAction(Action): 'condition': lambda Get: Get( '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', 'foreach': 'cl_builder_sync_overlay_rep', 'essential': False, diff --git a/pym/builder/wsdl_builder.py b/pym/builder/wsdl_builder.py index c948859..68dfa88 100644 --- a/pym/builder/wsdl_builder.py +++ b/pym/builder/wsdl_builder.py @@ -190,7 +190,9 @@ class Wsdl(WsdlBase): 'cl_builder_rebuild_changed_set', 'update.cl_update_skip_rb_set', 'update.cl_update_binhost_recheck_set', + 'update.cl_update_onedepth_set', 'update.cl_update_cleanpkg_set', + 'update.cl_update_check_rep_set', 'cl_builder_branch_data', 'cl_templates_locate', 'cl_verbose_set', @@ -347,11 +349,12 @@ class Wsdl(WsdlBase): # Включить проприетарные видео драйвера # Include proprietary video drivers 'cl_builder_videodrv_set', - 'cl_builder_compress', + 'update.cl_update_onedepth_set', 'cl_builder_keep_tree_set', 'cl_builder_live_set', 'cl_builder_isohybrid_set', 'cl_builder_prelink_set', + 'cl_builder_compress', 'cl_templates_locate', 'cl_verbose_set', 'cl_dispatch_conf'),