From b37055f7d8cc698b0272aa3caed707c6b2b96573 Mon Sep 17 00:00:00 2001 From: Lauri Aarnio Date: Thu, 12 Feb 2009 20:04:10 +0200 Subject: "devel" mode bugfix: exec_policy selection failed if tools_root was in homedir. --- lua_scripts/pathmaps/devel/00_default.lua | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'lua_scripts') diff --git a/lua_scripts/pathmaps/devel/00_default.lua b/lua_scripts/pathmaps/devel/00_default.lua index c61228b..19c5705 100644 --- a/lua_scripts/pathmaps/devel/00_default.lua +++ b/lua_scripts/pathmaps/devel/00_default.lua @@ -714,8 +714,18 @@ devel_exec_policies = { binary = nil, rules = { + -- Tools: + -- (tools must be listed first, the tools directory + -- might be under user's home directory) + {prefix = tools .. "/usr/bin/perl", + exec_policy = exec_policy_tools_perl}, + {prefix = tools .. "/usr/bin/python", + exec_policy = exec_policy_tools_python}, + {prefix = tools, exec_policy = exec_policy_tools}, + -- ~/bin probably contains programs for the host OS: - {prefix = sbox_user_home_dir.."/bin", exec_policy = exec_policy_host_os}, + {prefix = sbox_user_home_dir.."/bin", + exec_policy = exec_policy_host_os}, -- Other places under the home directory are expected -- to contain target binaries: @@ -724,11 +734,6 @@ devel_exec_policies = { -- Target binaries: {prefix = target_root, exec_policy = exec_policy_target}, - -- Tools: - {prefix = tools .. "/usr/bin/perl", exec_policy = exec_policy_tools_perl}, - {prefix = tools .. "/usr/bin/python", exec_policy = exec_policy_tools_python}, - {prefix = tools, exec_policy = exec_policy_tools}, - -- ----------------------------------------------- -- DEFAULT RULE (must exist): {prefix = "/", exec_policy = exec_policy_host_os} -- cgit v1.2.3