pool/python-pbr
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 326694 from Cloud:OpenStack:Master

Browse Source 
- update to 1.6.0:
  * Strip comments in requirements files
  * Handle git being entirely absent
  * We require the use of setuptools
  * Fix retrieval of commit data and most recent tag

- update to 1.6.0:
  * Strip comments in requirements files
  * Handle git being entirely absent
  * We require the use of setuptools
  * Fix retrieval of commit data and most recent tag
- Remove 0001-Handle-git-being-entirely-absent.patch .
  Applied upstream

OBS-URL: https://build.opensuse.org/request/show/326694
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-pbr?expand=0&rev=43
This commit is contained in:
Dirk Mueller 2015-08-26 15:47:05 +00:00 committed by Git OBS Bridge
parent afce122c08
commit a5f08ed8d9
7 changed files with 25 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-Handle-git-being-entirely-absent.patch
View File

@ -1,46 +0,0 @@
From 5c0bb9186fe2d65901744b00af24c8c50b3e1d29 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 10 Aug 2015 16:22:26 +1200
Subject: [PATCH] Handle git being entirely absent
When we try to find the git directory, if git is not present, treat
that the same as an error from git itself. Sadly tests for this are
nearly impossible to meaningfully write, since we always have git
installed. I can do a mock based test if folk want one.
Change-Id: If6160d1fb3def8133bdd0b66105e60ef93f80f82
Closes-Bug: #1481468
---
pbr/git.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/pbr/git.py b/pbr/git.py
index b4ae300..60acd3c 100644
--- a/pbr/git.py
+++ b/pbr/git.py
@@ -18,6 +18,7 @@ from __future__ import unicode_literals
import distutils.errors
from distutils import log
+import errno
import io
import os
import re
@@ -64,7 +65,13 @@ def _run_git_command(cmd, git_dir, **kwargs):
def _get_git_directory():
- return _run_shell_command(['git', 'rev-parse', '--git-dir'])
+ try:
+ return _run_shell_command(['git', 'rev-parse', '--git-dir'])
+ except OSError as e:
+ if e.errno == errno.ENOENT:
+ # git not installed.
+ return ''
+ raise
def _git_is_installed():
--
2.4.6

3
pbr-1.4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f080232fb6b208615b4c1854bf4277bb097d19c9ef89f94f203c1436fe600e92
size 102181

3
pbr-1.6.0.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4eaee8ff5544703edd1951ed1dc0b283da99a74f740d9f9055eeefcf329de1d1
size 99945

9
python-pbr-doc.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com
- update to 1.6.0:
* Strip comments in requirements files
* Handle git being entirely absent
* We require the use of setuptools
* Fix retrieval of commit data and most recent tag
-------------------------------------------------------------------
Tue Aug 11 07:34:34 UTC 2015 - seife+obs@b1-systems.com

2
python-pbr-doc.spec
View File

@ -17,7 +17,7 @@
Name: python-pbr-doc
Version: 1.4.0
Version: 1.6.0
Release: 0
Summary: Documentation for python-pbr
License: Apache-2.0

11
python-pbr.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Wed Aug 26 06:20:59 UTC 2015 - tbechtold@suse.com
- update to 1.6.0:
* Strip comments in requirements files
* Handle git being entirely absent
* We require the use of setuptools
* Fix retrieval of commit data and most recent tag
- Remove 0001-Handle-git-being-entirely-absent.patch .
Applied upstream
-------------------------------------------------------------------
Wed Aug 12 09:32:35 UTC 2015 - dmueller@suse.com

4
python-pbr.spec
View File

@ -21,7 +21,7 @@
%bcond_with test
Name: python-pbr
Version: 1.4.0
Version: 1.6.0
Release: 0
Summary: Python Build Reasonableness
License: Apache-2.0
@ -32,7 +32,6 @@ Source1: python-pbr-rpmlintrc
# NOTE(toabctl): this is currently in review: https://review.openstack.org/#/c/193462/
# needed to be abe to use pbr with newer Sphinx versions
Patch0: 0001-Remove-sphinx_config.init_values-manual-call.patch
Patch1: 0001-Handle-git-being-entirely-absent.patch
BuildRequires: fdupes
BuildRequires: python-devel
BuildRequires: python-pip >= 1.4
@ -71,7 +70,6 @@ information.
%prep
%setup -q -n pbr-%{version}
%patch0 -p1
%patch1 -p1
# Get rid of ugly build-time deps that require network:
sed -i "s/, 'sphinx\.ext\.intersphinx'//" doc/source/conf.py