Исправлено восстановление репозиторев

Исправлена реакция на вопрос emerge
master3.3
Mike khiretskiy 10 years ago
parent b931639734
commit 5f41c3103a

@ -321,7 +321,7 @@ class QuestionBlock(EmergeInformationBlock):
""" """
Блок вопроса Блок вопроса
""" """
default_answer = "no" default_answer = "yes"
_color_block = EmergeInformationBlock._color_block _color_block = EmergeInformationBlock._color_block
token = "Would you like" token = "Would you like"
end_token = ["]", "\n"] end_token = ["]", "\n"]

@ -94,6 +94,10 @@ class Update:
git.checkoutBranch(rpath, branch) git.checkoutBranch(rpath, branch)
if revision == "last": if revision == "last":
if git.resetRepository(rpath, to_origin=True): if git.resetRepository(rpath, to_origin=True):
# если не удалось сбросить
repInfo = git.getStatusInfo(rpath)
if repInfo.get("files", False):
raise GitError("Failed to reset git")
needMeta = True needMeta = True
else: else:
git.resetRepository(rpath, to_rev=revision) git.resetRepository(rpath, to_rev=revision)

Loading…
Cancel
Save