From 7def49c5b3a79dc3b15e3be5bb59fe89278219a7 Mon Sep 17 00:00:00 2001 From: Mike khiretskiy Date: Wed, 7 May 2014 18:02:52 +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=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=20?= =?UTF-8?q?=D1=81=20git-1.8.5.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update/package_tools.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/update/package_tools.py b/update/package_tools.py index b949f1f..5826ac4 100644 --- a/update/package_tools.py +++ b/update/package_tools.py @@ -329,7 +329,6 @@ class Git: rpath, "status", "--porcelain", stderr=STDOUT) if git_status.success(): - return False return not any(x.strip() for x in git_status) else: raise GitError( @@ -354,7 +353,7 @@ class Git: # оригинальная ветка 'origin':'origin/master'} """ - reStatus = re.compile("^## (\w+)(?:\.\.\.(\S+)\s+\[(ahead \d+)?" + reStatus = re.compile("^## (\w+)(?:\.\.\.(\S+))?(?:\s+\[(ahead \d+)?" "(?:, )?(behind \d+)?\])?\n?(.*|$)", re.S) match = reStatus.search(data) if not match: