From 1f027fa1ee9e613a6c197235873389c82b7efe67 Mon Sep 17 00:00:00 2001 From: Mike Khiretskiy Date: Mon, 21 Sep 2015 16:30:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=BA=D0=B0=20TemplatesError?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pym/builder/utils/cl_builder_break.py | 5 ++++- pym/builder/utils/cl_builder_image.py | 2 ++ pym/builder/utils/cl_builder_menu.py | 2 ++ pym/builder/utils/cl_builder_prepare.py | 5 ++++- pym/builder/utils/cl_builder_profile.py | 2 ++ pym/builder/utils/cl_builder_restore.py | 5 ++++- pym/builder/utils/cl_builder_update.py | 2 ++ 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pym/builder/utils/cl_builder_break.py b/pym/builder/utils/cl_builder_break.py index 825cd33..07123ad 100644 --- a/pym/builder/utils/cl_builder_break.py +++ b/pym/builder/utils/cl_builder_break.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError from ..datavars import BuilderError from calculate.lib.utils.portage import GitError @@ -31,7 +32,9 @@ class ClBuilderBreakAction(Action): Действие обновление конфигурационных файлов """ # ошибки, которые отображаются без подробностей - native_error = (DistributiveError, FilesError, BuilderError, GitError) + native_error = (DistributiveError, FilesError, + TemplatesError, + BuilderError, GitError) successMessage = __("Build broken successfully") failedMessage = None diff --git a/pym/builder/utils/cl_builder_image.py b/pym/builder/utils/cl_builder_image.py index 8c3d38e..41b371e 100644 --- a/pym/builder/utils/cl_builder_image.py +++ b/pym/builder/utils/cl_builder_image.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError from calculate.update.emerge_parser import EmergeError from calculate.update.update import UpdateError @@ -35,6 +36,7 @@ class ClBuilderImageAction(Action): """ # ошибки, которые отображаются без подробностей native_error = (DistributiveError, FilesError, UpdateError, + TemplatesError, BuilderError, GitError, EmergeError) successMessage = __("Image created successfully") diff --git a/pym/builder/utils/cl_builder_menu.py b/pym/builder/utils/cl_builder_menu.py index 4522c09..f9042d7 100644 --- a/pym/builder/utils/cl_builder_menu.py +++ b/pym/builder/utils/cl_builder_menu.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError from calculate.update.emerge_parser import EmergeError from calculate.update.update import UpdateError @@ -35,6 +36,7 @@ class ClBuilderMenuAction(Action): """ # ошибки, которые отображаются без подробностей native_error = (DistributiveError, FilesError, UpdateError, + TemplatesError, BuilderError, GitError, EmergeError) successMessage =__("Boot menu updated successfully") diff --git a/pym/builder/utils/cl_builder_prepare.py b/pym/builder/utils/cl_builder_prepare.py index 54f24d1..38790ca 100644 --- a/pym/builder/utils/cl_builder_prepare.py +++ b/pym/builder/utils/cl_builder_prepare.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError from ..datavars import BuilderError from calculate.lib.utils.portage import GitError @@ -31,7 +32,9 @@ class ClBuilderPrepareAction(Action): Действие обновление конфигурационных файлов """ # ошибки, которые отображаются без подробностей - native_error = (DistributiveError, FilesError, BuilderError, GitError) + native_error = (DistributiveError, FilesError, + TemplatesError, + BuilderError, GitError) successMessage = __("Build prepared successfully") failedMessage = __("Preparing the build is failed") diff --git a/pym/builder/utils/cl_builder_profile.py b/pym/builder/utils/cl_builder_profile.py index 9f2a4e3..988ddbb 100644 --- a/pym/builder/utils/cl_builder_profile.py +++ b/pym/builder/utils/cl_builder_profile.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError, isMount from calculate.update.update import UpdateError from ..datavars import BuilderError @@ -33,6 +34,7 @@ class ClBuilderProfileAction(Action): """ # ошибки, которые отображаются без подробностей native_error = (DistributiveError, FilesError, UpdateError, + TemplatesError, BuilderError, GitError) successMessage = __("The profile was successfully updated") diff --git a/pym/builder/utils/cl_builder_restore.py b/pym/builder/utils/cl_builder_restore.py index a54a9fc..d86056d 100644 --- a/pym/builder/utils/cl_builder_restore.py +++ b/pym/builder/utils/cl_builder_restore.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError, isMount from ..datavars import BuilderError from calculate.lib.utils.portage import GitError @@ -31,7 +32,9 @@ class ClBuilderRestoreAction(Action): Действие обновление конфигурационных файлов """ # ошибки, которые отображаются без подробностей - native_error = (DistributiveError, FilesError, BuilderError, GitError) + native_error = (DistributiveError, FilesError, + TemplatesError, + BuilderError, GitError) successMessage = __("Build was restored successfully") failedMessage = None diff --git a/pym/builder/utils/cl_builder_update.py b/pym/builder/utils/cl_builder_update.py index 43bb903..213d754 100644 --- a/pym/builder/utils/cl_builder_update.py +++ b/pym/builder/utils/cl_builder_update.py @@ -17,6 +17,7 @@ import sys from calculate.core.server.func import Action, Tasks from calculate.lib.cl_lang import setLocalTranslate, getLazyLocalTranslate +from calculate.lib.cl_template import TemplatesError from calculate.lib.utils.files import FilesError, isMount from calculate.update.emerge_parser import EmergeError from calculate.update.update import UpdateError @@ -37,6 +38,7 @@ class ClBuilderUpdateAction(Action): """ # ошибки, которые отображаются без подробностей native_error = (DistributiveError, FilesError, UpdateError, + TemplatesError, BuilderError, GitError, EmergeError) successMessage = None