Merge "Sync latest install_venv_common from oslo."

openstack/nova

Code Issues Proposed changes

This commit is contained in:

Jenkins

2013年02月07日 09:07:33 +00:00

committed by Gerrit Code Review

parent 20ecfb00be cacc8ff92d

commit 3fd1c63e37

2 changed files with 7 additions and 3 deletions

@@ -22,9 +22,6 @@

import os

import sys

parentdir = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))

os.sys.path.insert(0, parentdir)

import install_venv_common as install_venv

@@ -25,6 +25,13 @@ import os

import subprocess

import sys

possible_topdir = os.getcwd()

if os.path.exists(os.path.join(possible_topdir, "nova",

"__init__.py")):

sys.path.insert(0, possible_topdir)

from nova.openstack.common import cfg