summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-06-14 15:44:51 +0100
committerSalvatore Orlando <salvatore.orlando@eu.citrix.com>2011-06-14 15:44:51 +0100
commit1f717118f364d06eb9c1fc88548eb3bbc9f7b8eb (patch)
treeee338334f2b702eee6829d3c804d93e0df88f4d3 /tools
parent481c7be1834527053ffea4297230475518f6f8d7 (diff)
parent91e34d37d2907295e892e96ca2c3039c7fbe14bf (diff)
Merge trunk
Adapting code for removing dangling vdis and kernel/ramdisk files to latest changes
Diffstat (limited to 'tools')
-rw-r--r--tools/install_venv.py2
-rw-r--r--tools/pip-requires1
2 files changed, 2 insertions, 1 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 f1c5b2003..e81ef944a 100644
--- a/tools/pip-requires
+++ b/tools/pip-requires
@@ -33,3 +33,4 @@ suds==0.4
coverage
nosexcover
GitPython
+paramiko