summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-04-05 20:19:45 -0400
committerJenkins <jenkins@review.openstack.org>2013-04-06 01:24:08 +0000
commit5d39f9220aeef1720f7636ea5b4e0fb08ac16aca (patch)
treec43d822801b6e0dbe4ee45de7d0a97071ada5f45
parent8dff555d197960cfae6627b3676bcd46eb7692a2 (diff)
downloadpbr-5d39f9220aeef1720f7636ea5b4e0fb08ac16aca.tar.gz
Support forcing single-version-externally-managed.
git-review needs this to enable manpage installation. Change-Id: I23ffc654fb2a83319c8d450e91304ae9ed767820 Reviewed-on: https://review.openstack.org/26283 Reviewed-by: Clark Boylan <clark.boylan@gmail.com> Approved: Jeremy Stanley <fungi@yuggoth.org> Reviewed-by: Jeremy Stanley <fungi@yuggoth.org> Tested-by: Jenkins
-rw-r--r--pbr/hooks.py8
-rw-r--r--pbr/packaging.py11
2 files changed, 19 insertions, 0 deletions
diff --git a/pbr/hooks.py b/pbr/hooks.py
index d472313..923b0e4 100644
--- a/pbr/hooks.py
+++ b/pbr/hooks.py
@@ -50,6 +50,14 @@ pbr.packaging.LocalBuildDoc
pbr.packaging.LocalBuildLatex
"""
+ pbr_config = config.get('pbr', dict())
+ if ('single-version-externally-mananged' in pbr_config and
+ pbr_config['single-version-externally-mananged'] in
+ packaging.TRUE_VALUES):
+ config['global']['commands'] = config['global']['commands'] + """
+pbr.packaging.DistutilsInstall
+"""
+
#config['backwards_compat']['dependency_links'] = parse_dependency_links()
#config['backwards_compat']['include_package_data'] = True
#config['backwards_compat']['tests_require'] = parse_requirements(
diff --git a/pbr/packaging.py b/pbr/packaging.py
index c52a27d..75b14c4 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -27,7 +27,9 @@ import StringIO
import subprocess
import sys
+from distutils.command import install as du_install
from distutils import log
+from setuptools.command import install
from setuptools.command import sdist
log.set_verbosity(log.INFO)
@@ -218,6 +220,15 @@ def _find_modules(arg, dirname, files):
filename[:-3])] = True
+class DistutilsInstall(install.install):
+ """Forces single-version-externally-managed."""
+
+ command_name = 'install'
+
+ def run(self):
+ return du_install.install.run(self)
+
+
class LocalSDist(sdist.sdist):
"""Builds the ChangeLog and Authors files from VC first."""