OpenStack Compute (nova)

Merge lp:~pvo/nova/virtenv_resolve into lp:~hudson-openstack/nova/trunk

  1. virtenv_resolve
  2. Merge into trunk
Proposed by Paul Voccio
Status: Merged
Approved by: Monty Taylor
Approved revision: 173
Merged at revision: 173
Proposed branch: lp:~pvo/nova/virtenv_resolve
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 21 lines (+1/-5)
2 files modified
tools/activate_venv.sh (+0/-4)
tools/install_venv.py (+1/-1)
To merge this branch: bzr merge lp:~pvo/nova/virtenv_resolve
Reviewer Review Type Date Requested Status
Monty Taylor (community) Approve
Review via email: mp+31016@code.launchpad.net

Commit message

resolving conflict w/ merge, cleaning up virtenv setups

Description of the change

same commit, but with out merge conflicts.

To post a comment you must log in.
Revision history for this message
Monty Taylor (mordred) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'tools/activate_venv.sh'
2--- tools/activate_venv.sh 2010-07-27 01:57:24 +0000
3+++ tools/activate_venv.sh 1970-01-01 00:00:00 +0000
4@@ -1,4 +0,0 @@
5-#!/bin/bash
6-_TOOLS=`dirname $0`
7-_VENV=$_TOOLS/../.nova-venv
8-source $_VENV/bin/activate
9
10=== modified file 'tools/install_venv.py'
11--- tools/install_venv.py 2010-07-27 01:57:24 +0000
12+++ tools/install_venv.py 2010-07-27 04:28:42 +0000
13@@ -72,7 +72,7 @@
14 To activate the Nova virtualenv for the extent of your current shell session
15 you can run:
16
17- $ source tools/activate_venv.sh
18+ $ source .nova-venv/bin/activate
19
20 Or, if you prefer, you can run commands in the virtualenv on a case by case
21 basis by running: