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
This commit is contained in:
@@ -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())
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user