x/vmware-nsx
Code Issues Proposed changes

Merge "Fixes Windows setup dependency bug"

Browse Source
This commit is contained in:
Jenkins 2013-08-18 22:30:13 +00:00 committed by Gerrit Code Review
commit 0b38414b1a
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