diff --git a/.gitignore b/.gitignore index abf86ad..bd2741f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /git-review-1.22.tar.gz /git-review-1.24.tar.gz /git-review-1.25.0.tar.gz +/git-review-1.26.0.tar.gz diff --git a/git-review-1.25-no_git_dir.patch b/git-review-1.25-no_git_dir.patch deleted file mode 100644 index 5b3a1cf..0000000 --- a/git-review-1.25-no_git_dir.patch +++ /dev/null @@ -1,53 +0,0 @@ -Based on: - -commit 58a23a938a5a7b1317b825bd5635fd72c8f1580d -Author: Sachi King -Date: Tue Mar 29 10:51:32 2016 +1100 - - Fix no_git_dir UnboundLocalError in except block - - In Python 3, exception blocks clean their variables up, and we get - a UnbloundLocalError when we try to reference the target outside - of the except block. - - To pass the exception out we set a variable from the target. - - Also pull --license above raising the error, as it should work - outside a git repo too. - - https://www.python.org/dev/peps/pep-3110/#semantic-changes - - Change-Id: I298ac3648068cd07c4cf232e32ab3daaaf8e549d - -diff --git a/git_review/cmd.py b/git_review/cmd.py -index 9351242..affaf62 100755 ---- a/git_review/cmd.py -+++ b/git_review/cmd.py -@@ -1418,8 +1418,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")) -@@ -1428,13 +1428,14 @@ def _main(): - track=convert_bool(config['track']), - remote=config['remote']) - 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: diff --git a/git-review.spec b/git-review.spec index 9cf6987..1208edd 100644 --- a/git-review.spec +++ b/git-review.spec @@ -2,15 +2,14 @@ %global with_python3 1 Name: git-review -Version: 1.25.0 -Release: 9%{?dist} +Version: 1.26.0 +Release: 1%{?dist} Summary: A Git helper for integration with Gerrit Group: Development/Tools License: ASL 2.0 URL: https://github.com/openstack-infra/%{name} Source0: http://tarballs.openstack.org/%{name}/%{name}-%{version}.tar.gz -Patch1: git-review-1.25-no_git_dir.patch BuildArch: noarch @@ -39,7 +38,6 @@ requests in the patch management system Gerrit. It replaces the rfc.sh script. %prep %setup -q -%patch1 -p1 %build %if 0%{?with_python3} @@ -79,6 +77,9 @@ install -p -m 0644 -D git-review.1 %{buildroot}%{_mandir}/man1/git-review.1 %endif %changelog +* Tue May 08 2018 Pete Zaitcev - 1.26.0-1 +- Update to 1.26.0 (#1564233) + * Wed Feb 07 2018 Fedora Release Engineering - 1.25.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index ec1e24a..a5a5605 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a061d0e23ee9b93c6212a3fe68fb7ab git-review-1.25.0.tar.gz +SHA512 (git-review-1.26.0.tar.gz) = 74b2366d7884963caaa9b4614301fad56b7997d1cb16ef333cd2dae5df5a5343e5b891fc089078856b57db0083584a8b4ceea98dd67c401651a100fc4fdf7d81