From 9c96f9f2be6f42757e6c8c596c63f7433ad7e964 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Sun, 21 Aug 2005 08:48:13 +0100 Subject: [PATCH] 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 --- gitmergeonefile.py | 9 +++++---- stg | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/gitmergeonefile.py b/gitmergeonefile.py index fe416bd..4f79958 100755 --- 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 5ec2c22..5682dd4 100755 --- 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 -- 2.11.0