opendev/git-review
Code Issues Proposed changes

Fix regression in repeated -d of the same change.

Browse Source 
Fixes bug 1092943.

* git-review(download_review): Earlier refactoring in commit 4511318
resulted in checking the wrong output for existing branch errors,
since it moved into the exception data. Fixed in this commit.

Change-Id: I761b01c70ab93e77b112ddf85c63a829d5334196
This commit is contained in:
Marcin Cieslak 2012-12-21 20:23:55 +01:00
parent dd23f84ba1
commit a5c4a4d042
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-review
View File

@ -67,11 +67,11 @@ class CommandFailed(GitReviewException):
def __init__(self, *args):
Exception.__init__(self, *args)
(rc, output, argv, envp) = args
(self.rc, self.output, self.argv, self.envp) = args
self.quickmsg = dict([
("argv", " ".join(argv)),
("rc", rc),
("output", output)])
("argv", " ".join(self.argv)),
("rc", self.rc),
("output", self.output)])
def __str__(self):
return self.__doc__ + """
@ -712,8 +712,8 @@ def download_review(review, masterbranch, remote):
"git", "checkout", "-b",
branch_name, "FETCH_HEAD")
except CheckoutNewBranchFailed, e:
if re.search("already exists\.?", output):
except CheckoutNewBranchFailed as e:
if re.search("already exists\.?", e.output):
print("Branch already exists - reusing")
run_command_exc(CheckoutExistingBranchFailed,
"git", "checkout", branch_name)