diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-07-27 14:57:04 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-07-27 14:57:04 +0000 |
| commit | a8cffe5bf56a151b919d1f2cba1a7e57e6204775 (patch) | |
| tree | a31cd58a4a26d3db6d1f39605c6bf0c988a5ecb5 | |
| parent | 9e3af631e02251cb4c156f470e1deecacf9879e0 (diff) | |
| parent | 5b2116aad0fdffb94206b327f7a20ee077a3cae2 (diff) | |
| download | pbr-a8cffe5bf56a151b919d1f2cba1a7e57e6204775.tar.gz | |
Merge "Revert include_package_data change"
| -rw-r--r-- | pbr/hooks/backwards.py | 1 | ||||
| -rw-r--r-- | tools/integration.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/pbr/hooks/backwards.py b/pbr/hooks/backwards.py index de92eef..d9183b3 100644 --- a/pbr/hooks/backwards.py +++ b/pbr/hooks/backwards.py @@ -24,6 +24,7 @@ class BackwardsCompatConfig(base.BaseConfig): section = 'backwards_compat' def hook(self): + self.config['include_package_data'] = 'True' packaging.append_text_list( self.config, 'dependency_links', packaging.parse_dependency_links()) diff --git a/tools/integration.sh b/tools/integration.sh index 3b5e2a2..b32b303 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -184,6 +184,11 @@ for PROJECT in $PROJECTS ; do cd $installprojectdir $installvenv/bin/python setup.py install + # Ensure the install_package_data is doing the thing it should do + if [ $SHORT_PROJECT = 'nova' ]; then + find $installvenv | grep migrate.cfg + fi + # TODO(mordred): extend script to do a better job with the mirrir # easy_install to a file:/// can't handle name case insensitivity # Test python setup.py develop |