Merge lp:~soren/glance/glance-upload-sys.path into lp:~glance-coresec/glance/cactus-trunk

[Soren Hansen]

Add sys.path mangling to glance-upload.

Add the same sys.path mangling stuff to glance-upload that is in the other bin/*.

This fixes the following test failure in clean environments:

======================================================================
FAIL: test_exception_not_eaten_from_registry_to_api (tests.unit.test_misc.TestMiscellaneous)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/build/buildd/glance-2011.2~bzr76/tests/unit/test_misc.py", line 170, in test_exception_not_eaten_from_registry_to_api
    "result from glance-upload:\n%(e)s" % locals())
AssertionError: Could not find 'Invalid image type' in result from glance-upload:
Command ./bin/glance-upload --port=32001 --type=invalid /tmp/tmpEd3FfR 'my image' did not succeed. Returned an exit code of 1.

STDOUT:

STDERR: Traceback (most recent call last):
  File "./bin/glance-upload", line 53, in <module>
    from glance.client import Client
ImportError: No module named glance.client

[Jay Pipes (jaypipes)]

nice catch, thx soren.

review: Approve

=== modified file 'bin/glance-upload'
--- bin/glance-upload	2011-02-24 23:06:10 +0000
+++ bin/glance-upload	2011-02-28 09:32:31 +0000
@@ -48,8 +48,17 @@
 # available
 import argparse
 import pprint
+import os
 import sys
 
+# If ../glance/__init__.py exists, add ../ to Python search path, so that
+# it will override what happens to be installed in /usr/(local/)lib/python...
+possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
+                                   os.pardir,
+                                   os.pardir))
+if os.path.exists(os.path.join(possible_topdir, 'glance', '__init__.py')):
+    sys.path.insert(0, possible_topdir)
+
 from glance.client import Client