x/vmware-nsx
Code Issues Proposed changes

Fixes Windows setup dependency bug

Browse Source 
Fixes bug: #1212385

The neutron project includes a setup hook that allows to dinamically
include setup dependencies.

Due to recent changes in the pbr project, the hook raises an exception
on Windows, which ends the setup process.

This fix solves the issue by adapting the hook to the recent pbr changes.

Change-Id: I4b00d74d23a7167a10ba86458943ff16ca51b0db
This commit is contained in:
alexpilotti 2013-08-15 19:49:31 +03:00
parent 005ca6eb29
commit 63f35d0c43
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
neutron/hooks.py
View File

@ -21,10 +21,11 @@ import sys
def setup_hook(config): def setup_hook(config):
"""Filter config parsed from a setup.cfg to inject our defaults.""" """Filter config parsed from a setup.cfg to inject our defaults."""
metadata = config['metadata'] metadata = config['metadata']
requires = metadata.get('requires_dist', '').split('\n')
if sys.platform == 'win32': if sys.platform == 'win32':
requires = metadata.get('requires_dist', list()).split('\n')
requires.append('pywin32') requires.append('pywin32')
requires.append('wmi') requires.append('wmi')
requires.remove('pyudev') elif sys.platform.startswith('linux'):
metadata['requires_dist'] = "\n".join(requires) requires.append('pyudev')
metadata['requires_dist'] = "\n".join(requires)
config['metadata'] = metadata config['metadata'] = metadata

1
requirements.txt
View File

@ -14,7 +14,6 @@ iso8601>=0.1.4
kombu>=2.4.8 kombu>=2.4.8
netaddr netaddr
python-neutronclient>=2.2.3,<3 python-neutronclient>=2.2.3,<3
pyudev
SQLAlchemy>=0.7.8,<=0.7.99 SQLAlchemy>=0.7.8,<=0.7.99
WebOb>=1.2.3,<1.3 WebOb>=1.2.3,<1.3
python-keystoneclient>=0.3.0 python-keystoneclient>=0.3.0