OpenStack Compute (nova)

Merge lp:~gundlach/nova/fix-install-venv into lp:~hudson-openstack/nova/trunk

  1. fix-install-venv
  2. Merge into trunk
Proposed by Michael Gundlach
Status: Merged
Approved by: Eric Day
Approved revision: 215
Merge reported by: OpenStack Infra
Merged at revision: not available
Proposed branch: lp:~gundlach/nova/fix-install-venv
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
tools/install_venv.py (+1/-1)
To merge this branch: bzr merge lp:~gundlach/nova/fix-install-venv
Reviewer Review Type Date Requested Status
Eric Day (community) Approve
Review via email: mp+32155@code.launchpad.net

Commit message

Merge.

Description of the change

This change makes this code work correctly:

cd /path/to/branch/tools
python install_venv.py

The code couldn't handle a '.' or '' as dirname for install_venv.py.

To post a comment you must log in.
Revision history for this message
Eric Day (eday) wrote :

yup

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tools/install_venv.py'
2--- tools/install_venv.py 2010-07-27 04:23:44 +0000
3+++ tools/install_venv.py 2010-08-09 21:49:40 +0000
4@@ -7,7 +7,7 @@
5 import sys
6
7
8-ROOT = os.path.dirname(os.path.dirname(__file__))
9+ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__)))
10 VENV = os.path.join(ROOT, '.nova-venv')
11 PIP_REQUIRES = os.path.join(ROOT, 'tools', 'pip-requires')
12 TWISTED_NOVA='http://nova.openstack.org/Twisted-10.0.0Nova.tar.gz'