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>
if bin == 'bin' and prefix != sys.prefix:
major, minor = sys.version_info[0:2]
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
from stgit.config import config
from stgit.utils import append_string
sys.exec_prefix = prefix
major, minor = sys.version_info[0:2]
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
from stgit.main import main