From 5f41c3103a3287b41164b1a8f52e111b16792619 Mon Sep 17 00:00:00 2001
From: Mike khiretskiy <mh@calculate.ru>
Date: Fri, 25 Apr 2014 11:52:42 +0400
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BE=20=D0=B2=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=80=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=B7=D0=B8=D1=82=D0=BE=D1=80=D0=B5=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Исправлена реакция на вопрос emerge
---
 update/emerge_parser.py | 2 +-
 update/update.py        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/update/emerge_parser.py b/update/emerge_parser.py
index 204e758..80d012b 100644
--- a/update/emerge_parser.py
+++ b/update/emerge_parser.py
@@ -321,7 +321,7 @@ class QuestionBlock(EmergeInformationBlock):
     """
     Блок вопроса
     """
-    default_answer = "no"
+    default_answer = "yes"
     _color_block = EmergeInformationBlock._color_block
     token = "Would you like"
     end_token = ["]", "\n"]
diff --git a/update/update.py b/update/update.py
index 50dd30b..77b1d9b 100644
--- a/update/update.py
+++ b/update/update.py
@@ -94,6 +94,10 @@ class Update:
                 git.checkoutBranch(rpath, branch)
             if revision == "last":
                 if git.resetRepository(rpath, to_origin=True):
+                    # если не удалось сбросить
+                    repInfo = git.getStatusInfo(rpath)
+                    if repInfo.get("files", False):
+                        raise GitError("Failed to reset git")
                     needMeta = True
             else:
                 git.resetRepository(rpath, to_rev=revision)