diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-16 17:25:33 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-16 17:25:33 -0700 |
| commit | 7482cd2f25989ba544b1143b3a893009a127c061 (patch) | |
| tree | 18ada87f1ec6d69d3635a40ef1cf77c022099c6d | |
| parent | b7bc7fc59c1377337ab1cf1df72d417d66b72302 (diff) | |
| download | portage-7482cd2f25989ba544b1143b3a893009a127c061.tar.gz portage-7482cd2f25989ba544b1143b3a893009a127c061.tar.bz2 portage-7482cd2f25989ba544b1143b3a893009a127c061.zip | |
Move the fakeroot_state attribute back to EbuildSpawnProcess from
AbstractEbuildProcess (only EbuildSpawnProcess uses it).
| -rw-r--r-- | pym/_emerge/AbstractEbuildProcess.py | 4 | ||||
| -rw-r--r-- | pym/_emerge/EbuildSpawnProcess.py | 4 |
2 files changed, 4 insertions, 4 deletions
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) |