[paludis-commits] r4593 - in trunk: . paludis/repositories/e/ebuild paludis/util

[dleverton at svn.pioto.org]

Author: dleverton
Date: 2008-04-22 06:59:22 +0000 (Tue, 22 Apr 2008)
New Revision: 4593

Modified:
   trunk/ChangeLog
   trunk/paludis/repositories/e/ebuild/ebuild.bash
   trunk/paludis/util/system.cc
Log:
Prevent sandbox from sourcing /etc/profile, and remove previous nasty partial workaround.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-04-22 05:19:26 UTC (rev 4592)
+++ trunk/ChangeLog	2008-04-22 06:59:22 UTC (rev 4593)
@@ -5,6 +5,12 @@
 only listed in SVN log. For a summary of what has changed between releases,
 see the NEWS file. This file is occasionally pruned to ChangeLog.old.bz2.
 
+2008-04-22 David Leverton
+
+	* paludis/repositories/e/ebuild/, paludis/util/: Prevent sandbox
+	from sourcing /etc/profile, and remove previous nasty partial
+	workaround.
+
 2008-04-22 Ciaran McCreesh
 
 	* paludis/, doc/configuration/: Automatically create the set 'foo*',

Modified: trunk/paludis/repositories/e/ebuild/ebuild.bash
===================================================================
--- trunk/paludis/repositories/e/ebuild/ebuild.bash	2008-04-22 05:19:26 UTC (rev 4592)
+++ trunk/paludis/repositories/e/ebuild/ebuild.bash	2008-04-22 06:59:22 UTC (rev 4593)
@@ -20,8 +20,6 @@
 # this program; if not, write to the Free Software Foundation, Inc., 59 Temple
 # Place, Suite 330, Boston, MA  02111-1307  USA
 
-export PATH="${PATH_NOT_CLOBBERED_BY_SANDBOX}"
-
 unalias -a
 set +C
 unset GZIP BZIP BZIP2 CDPATH GREP_OPTIONS GREP_COLOR GLOBIGNORE

Modified: trunk/paludis/util/system.cc
===================================================================
--- trunk/paludis/util/system.cc	2008-04-22 05:19:26 UTC (rev 4592)
+++ trunk/paludis/util/system.cc	2008-04-22 06:59:22 UTC (rev 4593)
@@ -267,7 +267,11 @@
         Log::get_instance()->message("util.system.sandbox_in_sandbox", ll_warning, lc_no_context)
             << "Already inside sandbox, not spawning another sandbox instance";
     else
+    {
         _imp->command = "sandbox " + _imp->command;
+        if (getenv_with_default("BASH_ENV", "").empty())
+            with_setenv("BASH_ENV", "/dev/null");
+    }
 #endif
 
     return *this;
@@ -403,8 +407,6 @@
                 for (Command::ConstIterator s(cmd.begin_setenvs()), s_end(cmd.end_setenvs()) ; s != s_end ; ++s)
                     setenv(s->first.c_str(), s->second.c_str(), 1);
 
-                setenv("PATH_NOT_CLOBBERED_BY_SANDBOX", getenv_with_default("PATH", "").c_str(), 1);
-
                 if (cmd.pipe_command_handler())
                 {
                     setenv("PALUDIS_PIPE_COMMAND_WRITE_FD", stringify(pipe_command_reader->write_fd()).c_str(), 1);