opendev
/
git-review
Code Issues Proposed changes

Merge "Fix no_git_dir UnboundLocalError in except block"

This commit is contained in:
Jenkins 2016-08-30 14:26:37 +00:00 committed by Gerrit Code Review
parent 535202f579 58a23a938a
commit 59f87fe3d6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
git_review/cmd.py
View File

@ -1447,8 +1447,8 @@ def _main():
yes=False)
try:
(top_dir, git_dir) = git_directories()
except GitDirectoriesException as no_git_dir:
pass
except GitDirectoriesException as _no_git_dir:
no_git_dir = _no_git_dir
else:
no_git_dir = False
config = Config(os.path.join(top_dir, ".gitreview"))
@ -1457,13 +1457,14 @@ def _main():
remote=None,
usepushurl=convert_bool(config['usepushurl']))
options = parser.parse_args()
if no_git_dir:
raise no_git_dir
if options.license:
print(COPYRIGHT)
sys.exit(0)
if no_git_dir:
raise no_git_dir
if options.branch is None:
branch = config['branch']
else: