Move the local search path at the beginning of sys.path

This patch allows StGIT to search for the package files in the local
directories first, in order to avoid problems with multiple installations.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>

diff --git a/gitmergeonefile.py b/gitmergeonefile.py
index fe416bdb8f1fafbb72c1b123c7906937f2cb7176..4f799588fc089e422b5b4fe24a885b011fa51e4a 100755 (executable)
--- a/gitmergeonefile.py
+++ b/gitmergeonefile.py
@@ -27,10 +27,11 @@ prefix, bin = os.path.split(sys.path[0])
 
 if bin == 'bin' and prefix != sys.prefix:
     major, minor = sys.version_info[0:2]
-    sys.path += [os.path.join(prefix, 'lib', 'python'),
-                 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
-                 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
-                              'site-packages')]
+    local_path = [os.path.join(prefix, 'lib', 'python'),
+                  os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
+                  os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
+                               'site-packages')]
+    sys.path = local_path + sys.path
 
 from stgit.config import config
 from stgit.utils import append_string

diff --git a/stg b/stg
index 5ec2c22b0579d1bc939fe9c6739c2682f836606c..5682dd4d94deeb76440410525ad23fe5b129f751 100755 (executable)
--- a/stg
+++ b/stg
@@ -31,10 +31,11 @@ if bin == 'bin' and prefix != sys.prefix:
     sys.exec_prefix = prefix
 
     major, minor = sys.version_info[0:2]
-    sys.path += [os.path.join(prefix, 'lib', 'python'),
-                 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
-                 os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
-                              'site-packages')]
+    local_path = [os.path.join(prefix, 'lib', 'python'),
+                  os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor)),
+                  os.path.join(prefix, 'lib', 'python%s.%s' % (major, minor),
+                               'site-packages')]
+    sys.path = local_path + sys.path
 
 from stgit.main import main