From 6aac0268c84686dda9ef930dc53f2efaa14470be Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Tue, 8 Sep 2015 16:14:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D1=8B=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B2=D0=BE=D0=B4=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/build_storage.py | 2 +- pym/builder/utils/cl_builder_break.py | 8 ++++---- pym/builder/utils/cl_builder_image.py | 5 ++--- pym/builder/utils/cl_builder_profile.py | 2 +- pym/builder/utils/cl_builder_restore.py | 7 +++---- pym/builder/utils/cl_builder_update.py | 2 +- pym/builder/variables/builder.py | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/pym/builder/build_storage.py b/pym/builder/build_storage.py index 226c503..973209e 100644 --- a/pym/builder/build_storage.py +++ b/pym/builder/build_storage.py @@ -172,7 +172,7 @@ class BuildStorage(object): """ with self.modify_ini() as ini: if build_id in ini: - raise BuilderError(_("Assemble id '%s' already in use")) + raise BuilderError(_("Build ID '%s' already in use")) else: ini.add_section(build_id) diff --git a/pym/builder/utils/cl_builder_break.py b/pym/builder/utils/cl_builder_break.py index 84c860d..825cd33 100644 --- a/pym/builder/utils/cl_builder_break.py +++ b/pym/builder/utils/cl_builder_break.py @@ -33,21 +33,21 @@ class ClBuilderBreakAction(Action): # ошибки, которые отображаются без подробностей native_error = (DistributiveError, FilesError, BuilderError, GitError) - successMessage = __("Assemble broken successfully") + successMessage = __("Build broken successfully") failedMessage = None - interruptMessage = __("Breaking manually interrupted") + interruptMessage = __("Build breaking manually interrupted") # список задач для действия tasks = [ {'name': 'check_build_run', 'method': 'Builder.check_build_run()'}, {'name': 'close_build', - 'message': __("Breaking {cl_builder_id} assemble"), + 'message': __("Breaking {cl_builder_id} build"), 'method': 'Builder.close_build(cl_builder_build,cl_builder_clear_set)', 'condition': lambda Get: Get('cl_builder_build') }, {'name': 'failed', - 'error': __("Breaking the assemble is failed"), + 'error': __("Breaking the build is failed"), 'depend': (Tasks.failed() & Tasks.hasnot("interrupt") & Tasks.success_all("check_build_run")) }, diff --git a/pym/builder/utils/cl_builder_image.py b/pym/builder/utils/cl_builder_image.py index 1ac70cb..221c7e2 100644 --- a/pym/builder/utils/cl_builder_image.py +++ b/pym/builder/utils/cl_builder_image.py @@ -86,7 +86,6 @@ class ClBuilderImageAction(Action): 'tasks': [ # закрепить подключенные данные {'name': 'detach', - 'message': __("Detach target"), 'method': 'Builder.detach_target(cl_builder_target)', }, {'name': 'umount_system', @@ -110,7 +109,7 @@ class ClBuilderImageAction(Action): 'method': 'Builder.create_dev_nodes(cl_builder_path)' }, {'name': 'apply_template', - 'message': __("Configuring squash"), + 'message': __("Configuring squash filesystem image"), # наложить шаблоны в развернутый дистрибутив 'method': 'Builder.applyTemplates(cl_builder_target,' 'False,False,None)', @@ -123,7 +122,7 @@ class ClBuilderImageAction(Action): 'method': "Builder.remove_list_digest(cl_builder_image_filename)" }, {'name': 'unpack', - 'message': __("Pack squash"), + 'message': __("Pack squash filesystem image"), 'method': 'Install.unpack(cl_builder_target, cl_builder_image,' '"0")', }, diff --git a/pym/builder/utils/cl_builder_profile.py b/pym/builder/utils/cl_builder_profile.py index 92aaad4..9f2a4e3 100644 --- a/pym/builder/utils/cl_builder_profile.py +++ b/pym/builder/utils/cl_builder_profile.py @@ -119,7 +119,7 @@ class ClBuilderProfileAction(Action): # 'sys-apps/calculate-utils', Get('cl_builder_path')) # }, {'name': 'reconfigure', - 'message': __("Reconfigure the settings"), + 'message': __("The build is being configured"), 'method': 'Builder.apply_templates(cl_builder_path,' 'cl_template_clt_set,True,None,False,"merge",' 'cl_builder_profile_datavars)', diff --git a/pym/builder/utils/cl_builder_restore.py b/pym/builder/utils/cl_builder_restore.py index 0645244..a54a9fc 100644 --- a/pym/builder/utils/cl_builder_restore.py +++ b/pym/builder/utils/cl_builder_restore.py @@ -42,24 +42,23 @@ class ClBuilderRestoreAction(Action): {'name': 'check_build_run', 'method': 'Builder.check_build_run()'}, {'name': 'restore_build', - 'message': __("Restoring {cl_builder_id} assemble"), + 'message': __("Restoring {cl_builder_id} build"), 'method': 'Builder.restore_build(cl_builder_build)', 'condition': lambda Get: not isMount(Get('cl_builder_path')) }, # подмонтировать необходимые данные {'name': 'mount', - 'message': __("Mounting target"), + 'message': __("Mounting build resources"), 'method': 'Builder.mount_target(cl_builder_target)', }, # save {'name': 'save', - 'message': __("Save distro"), + 'message': __("Save build information"), 'method': 'Builder.save_build(cl_builder_build,' 'cl_builder_linux_datavars)', }, # закрепить подключенные данные {'name': 'detach', - 'message': __("Detach target"), 'method': 'Builder.detach_target(cl_builder_target)', }, {'name': 'failed', diff --git a/pym/builder/utils/cl_builder_update.py b/pym/builder/utils/cl_builder_update.py index 4f88e11..48b9ad2 100644 --- a/pym/builder/utils/cl_builder_update.py +++ b/pym/builder/utils/cl_builder_update.py @@ -103,7 +103,7 @@ class ClBuilderUpdateAction(Action): not Get('update.cl_update_binhost_data')[0]) }, {'name': 'binhost_unavailable', - 'error': __("Binhost is unavailable"), + 'error': __("Update server is unavailable"), 'condition': lambda Get:( Get('cl_builder_binary_set') == "on" and not Get('update.cl_update_binhost_data')[0]) diff --git a/pym/builder/variables/builder.py b/pym/builder/variables/builder.py index 4628e47..337b5b4 100644 --- a/pym/builder/variables/builder.py +++ b/pym/builder/variables/builder.py @@ -498,9 +498,9 @@ class VariableClBuilderNewId(BaseBuildId): def check(self, value): if not value and self.Get('cl_builder_source_filename'): - raise VariableError(_("Please specify the id")) + raise VariableError(_("Please specify the build ID")) if value and not re.match("^[A-Za-z][A-Za-z0-9/:_-]+$", value): - raise VariableError(_("Wrong symbols in build ID")) + raise VariableError(_("Wrong symbols in the build ID")) if value in self.Get('cl_builder_storage'): raise VariableError(_("Build %s already exists")%value)