Merge "Adds possible topdir to python search path"

1 files changed, 10 insertions, 0 deletions

diff --git a/bin/heat-manage b/bin/heat-manage
index 1a03e17ab..95e4a5d14 100755
--- a/bin/heat-manage
+++ b/bin/heat-manage
@@ -14,6 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import os
+import sys
+
+# If ../heat/__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, 'heat', '__init__.py')):
+    sys.path.insert(0, POSSIBLE_TOPDIR)
 
 from heat.cmd import manage