From 678735dae26e4fb43bb5ef5a091c8bf2d76426ab 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, 29 Apr 2016 11:42:17 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D1=80=D1=8B=D1=82=D0=B0=20=D0=BE?= =?UTF-8?q?=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20=D0=BF=D1=80=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8=D0=B7=D0=B0=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D1=8F,=20=D0=B5=D1=81=D0=BB=D0=B8=20=D1=83=D0=BA?= =?UTF-8?q?=D0=B0=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=B0=D1=82?= =?UTF-8?q?=D0=B0=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit не является git репозиторием --- pym/update/update.py | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pym/update/update.py b/pym/update/update.py index 5b34c45..c46e8b5 100644 --- a/pym/update/update.py +++ b/pym/update/update.py @@ -38,7 +38,7 @@ import shutil from collections import MutableSet from update_tasks import EmergeMark -from calculate.lib.utils.git import Git, GitError, MTimeKeeper +from calculate.lib.utils.git import Git, GitError, MTimeKeeper, NotGitError from calculate.lib.utils.portage import (Layman, EmergeLog, EmergeLogNamedTask, PackageList, PackageInformation, @@ -336,14 +336,15 @@ class Update(MethodsInterface): return "skip" return True except GitError as e: - if e.addon: - self.printWARNING(str(e.addon)) - self.printWARNING(str(e)) - self.endTask(False) - self.startTask( - _("Re-fetching the {name} repository").format( - name=repname)) - self.addProgress() + if not isinstance(e, NotGitError): + if e.addon: + self.printWARNING(str(e.addon)) + self.printWARNING(str(e)) + self.endTask(False) + self.startTask( + _("Re-fetching the {name} repository").format( + name=repname)) + self.addProgress() rpath_new = "%s_new" % rpath try: self._syncRepository(repname, url, rpath_new, revision,