diff options
author | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-01 14:42:43 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <marco@localhost.localdomain> | 2007-05-01 14:42:43 (GMT) |
commit | 152361c592188574d96c0d52352a35618014a084 (patch) | |
tree | 0ecab6a091924713cb5c0e0b09c9c3ca06a39e37 | |
parent | f34e5fd36b2d6bf234cc8264a53916312a89201c (diff) |
Do not fallback to SUGAR_PREFIX for the sugar path. Require SUGAR_PATH.
-rw-r--r-- | bin/sugar.in | 1 | ||||
-rw-r--r-- | sugar/env.py | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/sugar.in b/bin/sugar.in index de2595d..452ccd4 100644 --- a/bin/sugar.in +++ b/bin/sugar.in @@ -1,2 +1,3 @@ +export SUGAR_PATH=@prefix@/share/sugar export GTK2_RC_FILES=@prefix@/share/sugar/data/gtkrc dbus-launch --exit-with-session sugar-shell diff --git a/sugar/env.py b/sugar/env.py index 3555e93..4bee509 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -33,7 +33,7 @@ def _get_sugar_path(base, path=None): if os.environ.has_key('SUGAR_PATH'): sugar_path = os.environ['SUGAR_PATH'] else: - sugar_path = _get_prefix_path('share/sugar') + raise RuntimeError("The SUGAR_PATH environment variable is not set.") if path: return os.path.join(sugar_path, base, path) |