diff options
| author | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2013-01-16 18:05:50 +0000 |
|---|---|---|
| committer | Johannes Erdfelt <johannes.erdfelt@rackspace.com> | 2013-01-16 18:05:50 +0000 |
| commit | 93aacfa8eff3fa04578313c717de7ed2c28a51ef (patch) | |
| tree | 203081c0829254830a322072b0a14e884d390a57 /openstack/common | |
| parent | 848b1cf1fa03572dbe1e96907a0a5547b3cc6bef (diff) | |
| download | oslo-93aacfa8eff3fa04578313c717de7ed2c28a51ef.tar.gz oslo-93aacfa8eff3fa04578313c717de7ed2c28a51ef.tar.xz oslo-93aacfa8eff3fa04578313c717de7ed2c28a51ef.zip | |
Stop using no longer valid -E option for pip
Fixes bug 1100403
Version 1.1 of pip dropped the -E option. It's not necessary anyway since
running pip in a correctly setup virtualenv will automatically do the right
thing.
Change-Id: Ifec9f27b8dc169d594125a0808126abe77ed42e7
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/setup.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py index 315ea87..32f093f 100644 --- a/openstack/common/setup.py +++ b/openstack/common/setup.py @@ -108,10 +108,9 @@ def parse_dependency_links(requirements_files=['requirements.txt', def write_requirements(): - venv = os.environ.get('VIRTUAL_ENV', None) - if venv is not None: + if 'VIRTUAL_ENV' in os.environ: with open("requirements.txt", "w") as req_file: - output = subprocess.Popen(["pip", "-E", venv, "freeze", "-l"], + output = subprocess.Popen(["pip", "freeze", "-l"], stdout=subprocess.PIPE) requirements = output.communicate()[0].strip() req_file.write(requirements) |