diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-03-20 09:04:02 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-03-20 09:04:02 +0000 |
| commit | c0462311696cdc8f82b945b4c90070a9fd89ef9f (patch) | |
| tree | 1682e805d5faa11265eabfd600a7d4fa618a964c | |
| parent | cae801095de9a1060174baea808fc5ed6706a3ca (diff) | |
| download | portage-c0462311696cdc8f82b945b4c90070a9fd89ef9f.tar.gz portage-c0462311696cdc8f82b945b4c90070a9fd89ef9f.tar.bz2 portage-c0462311696cdc8f82b945b4c90070a9fd89ef9f.zip | |
Fix sandbox feature (broken since r2947).
svn path=/main/trunk/; revision=2963
| -rw-r--r-- | pym/portage.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pym/portage.py b/pym/portage.py index 586fe46d8..929a541c4 100644 --- a/pym/portage.py +++ b/pym/portage.py @@ -1641,15 +1641,17 @@ def spawn(mystring,mysettings,debug=0,free=0,droppriv=0,sesandbox=0,fd_pipes=Non if free: keywords["opt_name"] += " bash" + spawn_func = portage_exec.spawn_bash else: keywords["opt_name"] += " sandbox" + spawn_func = portage_exec.spawn_sandbox if sesandbox: con = selinux.getcontext() con = string.replace(con, mysettings["PORTAGE_T"], mysettings["PORTAGE_SANDBOX_T"]) selinux.setexec(con) - retval = portage_exec.spawn_bash(mystring, env=env, **keywords) + retval = spawn_func(mystring, env=env, **keywords) if sesandbox: selinux.setexec(None) |