summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-04-05 21:33:04 -0400
committerJenkins <jenkins@review.openstack.org>2013-04-08 23:50:12 +0000
commit778d76ba2a35a3b94d752e578418310db789985a (patch)
tree0d63abc5bbd180b3d1855dc2e44f26bdc3ed815a
parent2796f9add5be6e2b2c0b5139070eb746eb05ce4c (diff)
downloadpbr-778d76ba2a35a3b94d752e578418310db789985a.tar.gz
Don't try to smart find packages that aren't there.0.5.8
We help out by looking for the obvious stuff. But sometimee, like in git-review, we don't have a package at all. Change-Id: Ic575c0008c69ffaba43a637b460899dd848d3fd5 Reviewed-on: https://review.openstack.org/26289 Reviewed-by: James E. Blair <corvus@inaugust.com> Approved: Clark Boylan <clark.boylan@gmail.com> Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Tested-by: Jenkins
-rw-r--r--pbr/hooks.py5
-rw-r--r--tox.ini2
2 files changed, 4 insertions, 3 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py
index 0b572d6..dd22501 100644
--- a/pbr/hooks.py
+++ b/pbr/hooks.py
@@ -64,8 +64,9 @@ pbr.packaging.DistutilsInstall
# ["test-requirements.txt", "tools/test-requires"])
files = config.get('files', dict())
- files['packages'] = smart_find_packages(
- files.get('packages', metadata['name']))
+ package = files.get('packages', metadata['name']).strip()
+ if os.path.isdir(package):
+ files['packages'] = smart_find_packages(package)
if 'manpages' in pbr_config:
man_sections = dict()
diff --git a/tox.ini b/tox.ini
index 6e4f3d1..20b64f0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -30,5 +30,5 @@ commands =
commands = {posargs}
[flake8]
-exclude = .venv,.tox,dist,doc,*.egg
+exclude = .venv,.tox,dist,doc,*.egg,build
show-source = true