Get rid of the global python path extensions
This commit is contained in:
@@ -5,6 +5,4 @@ sugar_activity_info_dir = '@prefix@/share/sugar/activities'
|
||||
sugar_services_dir = '@prefix@/share/sugar/services'
|
||||
sugar_dbus_config = '@prefix@/share/sugar/dbus-installed.conf'
|
||||
|
||||
sugar_python_path = ['@prefix@/share/sugar/activities']
|
||||
|
||||
sugar_bin_path = []
|
||||
|
||||
@@ -10,9 +10,6 @@ sugar_activity_info_dir = __tmpdir
|
||||
|
||||
sugar_dbus_config = os.path.join(sugar_source_dir, 'dbus-uninstalled.conf')
|
||||
|
||||
sugar_python_path = []
|
||||
sugar_python_path.append(os.path.join(sugar_source_dir, 'activities'))
|
||||
|
||||
sugar_bin_path = []
|
||||
sugar_bin_path.append(os.path.join(sugar_source_dir))
|
||||
sugar_bin_path.append(os.path.join(sugar_source_dir, 'shell'))
|
||||
|
||||
@@ -26,17 +26,7 @@ except ImportError:
|
||||
|
||||
import sugar.setup
|
||||
|
||||
def setup_python_path():
|
||||
for path in sugar_python_path:
|
||||
if os.environ.has_key('PYTHONPATH'):
|
||||
old_path = os.environ['PYTHONPATH']
|
||||
os.environ['PYTHONPATH'] = path + ':' + old_path
|
||||
else:
|
||||
os.environ['PYTHONPATH'] = path
|
||||
|
||||
def setup_system():
|
||||
setup_python_path()
|
||||
|
||||
for path in sugar_bin_path:
|
||||
if os.environ.has_key('PATH'):
|
||||
old_path = os.environ['PATH']
|
||||
|
||||
Reference in New Issue
Block a user