From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 17 Aug 2010 00:25:33 +0000 (-0700)
Subject: Move the fakeroot_state attribute back to EbuildSpawnProcess from
X-Git-Tag: v2.2_rc68~149
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7482cd2f25989ba544b1143b3a893009a127c061;p=portage.git

Move the fakeroot_state attribute back to EbuildSpawnProcess from
AbstractEbuildProcess (only EbuildSpawnProcess uses it).
---

diff --git a/pym/_emerge/AbstractEbuildProcess.py b/pym/_emerge/AbstractEbuildProcess.py
index 4f7a658f4..aca254191 100644
--- a/pym/_emerge/AbstractEbuildProcess.py
+++ b/pym/_emerge/AbstractEbuildProcess.py
@@ -21,11 +21,9 @@ from portage.util import apply_secpass_permissions, writemsg_stdout
 
 class AbstractEbuildProcess(SpawnProcess):
 
-	__slots__ = ('fakeroot_state', 'phase', 'settings',) + \
+	__slots__ = ('phase', 'settings',) + \
 		('_ipc_daemon', '_exit_command',)
 	_phases_without_builddir = ('clean', 'cleanrm', 'depend', 'help',)
-	_spawn_kwarg_names = SpawnProcess._spawn_kwarg_names + \
-		('fakeroot_state',)
 
 	# The EbuildIpcDaemon support is well tested, but this variable
 	# is left so we can temporarily disable it if any issues arise.
diff --git a/pym/_emerge/EbuildSpawnProcess.py b/pym/_emerge/EbuildSpawnProcess.py
index 8293fcd35..dd12b74e9 100644
--- a/pym/_emerge/EbuildSpawnProcess.py
+++ b/pym/_emerge/EbuildSpawnProcess.py
@@ -9,8 +9,10 @@ class EbuildSpawnProcess(AbstractEbuildProcess):
 	"""
 	Used by doebuild.spawn() to manage the spawned process.
 	"""
+	_spawn_kwarg_names = AbstractEbuildProcess._spawn_kwarg_names + \
+		('fakeroot_state',)
 
-	__slots__ = ('spawn_func',)
+	__slots__ = ('fakeroot_state', 'spawn_func')
 
 	def _spawn(self, args, **kwargs):
 		return self.spawn_func(args, env=self.settings.environ(), **kwargs)