diff options
| author | Trey Morris <trey.morris@rackspace.com> | 2011-06-02 17:46:16 -0500 |
|---|---|---|
| committer | Trey Morris <trey.morris@rackspace.com> | 2011-06-02 17:46:16 -0500 |
| commit | b6af3d070a7767182df09e6f3e739675e6dbea89 (patch) | |
| tree | b88e87226a1b9703b54cd90f19b70ed32b87eaa9 /tools | |
| parent | eee29c8142e530c801d655cf27858297946010ec (diff) | |
| parent | f3e3b4b0fb1fb948f0fa5042ab854c00a710a6c2 (diff) | |
| download | nova-b6af3d070a7767182df09e6f3e739675e6dbea89.tar.gz nova-b6af3d070a7767182df09e6f3e739675e6dbea89.tar.xz nova-b6af3d070a7767182df09e6f3e739675e6dbea89.zip | |
merge trunk... yay...
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/install_venv.py | 2 | ||||
| -rw-r--r-- | tools/pip-requires | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tools/install_venv.py b/tools/install_venv.py index 812b1dd0f..f4b6583ed 100644 --- a/tools/install_venv.py +++ b/tools/install_venv.py @@ -36,7 +36,7 @@ PY_VERSION = "python%s.%s" % (sys.version_info[0], sys.version_info[1]) def die(message, *args): - print >>sys.stderr, message % args + print >> sys.stderr, message % args sys.exit(1) diff --git a/tools/pip-requires b/tools/pip-requires index 8f8018765..f1c5b2003 100644 --- a/tools/pip-requires +++ b/tools/pip-requires @@ -17,8 +17,7 @@ redis==2.0.0 routes==1.12.3 WebOb==0.9.8 wsgiref==0.1.2 -mox==0.5.0 --f http://pymox.googlecode.com/files/mox-0.5.0.tar.gz +mox==0.5.3 greenlet==0.3.1 nose bzr |