Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar
This commit is contained in:
		
						commit
						2e86ad91b9
					
				| @ -79,7 +79,10 @@ def get_environment(activity): | |||||||
|     environ = os.environ.copy() |     environ = os.environ.copy() | ||||||
| 
 | 
 | ||||||
|     bin_path = os.path.join(activity.path, 'bin') |     bin_path = os.path.join(activity.path, 'bin') | ||||||
|  |     activity_root = env.get_profile_path(activity.bundle_id) | ||||||
|  | 
 | ||||||
|     environ['SUGAR_BUNDLE_PATH'] = activity.path |     environ['SUGAR_BUNDLE_PATH'] = activity.path | ||||||
|  |     environ['SUGAR_ACTIVITY_ROOT'] = activity_root | ||||||
|     environ['PATH'] = bin_path + ':' + environ['PATH'] |     environ['PATH'] = bin_path + ':' + environ['PATH'] | ||||||
| 
 | 
 | ||||||
|     return environ |     return environ | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Simon McVittie
						Simon McVittie