From 611bd9ccda271f7d82eb4aa68856c0a12fd13771 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 21 Oct 2008 17:07:03 +0200 Subject: [PATCH] Only absolutize the command when it doesnt contain already a slash --- src/sugar/activity/activityfactory.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/sugar/activity/activityfactory.py b/src/sugar/activity/activityfactory.py index 75503fcc..97583a0a 100644 --- a/src/sugar/activity/activityfactory.py +++ b/src/sugar/activity/activityfactory.py @@ -131,10 +131,13 @@ def get_command(activity, activity_id=None, object_id=None, uri=None): if uri is not None: command.extend(['-u', uri]) - bin_path = os.path.join(activity.get_path(), 'bin') - absolute_path = os.path.join(bin_path, command[0]) - if os.path.exists(absolute_path): - command[0] = absolute_path + # if the command is in $BUNDLE_ROOT/bin, execute the absolute path so there + # is no need to mangle with the shell's PATH + if '/' not in command[0]: + bin_path = os.path.join(activity.get_path(), 'bin') + absolute_path = os.path.join(bin_path, command[0]) + if os.path.exists(absolute_path): + command[0] = absolute_path logging.debug('launching: %r' % command)