From 5b2116aad0fdffb94206b327f7a20ee077a3cae2 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 23 Jul 2013 10:30:35 -0700 Subject: Revert include_package_data change Setting the value directly in kwargs is not doing what we want it to do. This is largely because of how the hook system works. When the hooks process backwards_compat, they do a config.get('backwards_compat', dict()), which is then written back to the config dict - which means that blank override values are being fed in. Later we can go through and just re-engineer how that works. For now, unbreak nova. Change-Id: I0c6055253cbc89b6884553e6f2fbfe8a7bbd1953 --- pbr/hooks/backwards.py | 1 + tools/integration.sh | 5 +++++ 2 files changed, 6 insertions(+) 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 1e42aff..178144b 100644 --- a/tools/integration.sh +++ b/tools/integration.sh @@ -182,6 +182,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 -- cgit v1.2.1