From 93b654199a32fc3df1299b030317720b9294b0c3 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 14 Jan 2012 07:29:08 -0800 Subject: Apply INSTALL_MASK prior to collision-protect. It may be useful to avoid collisions in some scenarios. --- pym/_emerge/MiscFunctionsProcess.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'pym/_emerge') diff --git a/pym/_emerge/MiscFunctionsProcess.py b/pym/_emerge/MiscFunctionsProcess.py index ce0ab1432..afa44fb2a 100644 --- a/pym/_emerge/MiscFunctionsProcess.py +++ b/pym/_emerge/MiscFunctionsProcess.py @@ -29,5 +29,11 @@ class MiscFunctionsProcess(AbstractEbuildProcess): AbstractEbuildProcess._start(self) def _spawn(self, args, **kwargs): - self.settings.pop("EBUILD_PHASE", None) - return spawn(" ".join(args), self.settings, **kwargs) + # Temporarily unset EBUILD_PHASE so that bashrc code doesn't + # think this is a real phase. + phase_backup = self.settings.pop("EBUILD_PHASE", None) + try: + return spawn(" ".join(args), self.settings, **kwargs) + finally: + if phase_backup is not None: + self.settings["EBUILD_PHASE"] = phase_backup -- cgit v1.2.3-1-g7c22