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 4f7a658f421ae0af279628f20cf1b1c99b10ceff..aca254191974668a8e3409a641c1edda4469de77 100644 (file)
--- 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 8293fcd3504fe50930cdc6d5bf1bcfcf26299cd3..dd12b74e98f1417fd30269de1d49540a545bc62f 100644 (file)
--- 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)