diff options
| author | Zac Medico <zmedico@gentoo.org> | 2010-08-16 09:24:14 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2010-08-16 09:24:14 -0700 |
| commit | 56c90238b2a0664728d71e21dcf197324f5570bb (patch) | |
| tree | 1726f985d9d03120e6382c95f1b9746392b03bab | |
| parent | 5410d3b3fa536f305867a09a6ab640085ef6d0a0 (diff) | |
| download | portage-56c90238b2a0664728d71e21dcf197324f5570bb.tar.gz portage-56c90238b2a0664728d71e21dcf197324f5570bb.tar.bz2 portage-56c90238b2a0664728d71e21dcf197324f5570bb.zip | |
Move fakeroot_state attribute from EbuildSpawnProcess to
AbstractEbuildProcess.
| -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 aca254191..4f7a658f4 100644 --- a/pym/_emerge/AbstractEbuildProcess.py +++ b/pym/_emerge/AbstractEbuildProcess.py @@ -21,9 +21,11 @@ from portage.util import apply_secpass_permissions, writemsg_stdout class AbstractEbuildProcess(SpawnProcess): - __slots__ = ('phase', 'settings',) + \ + __slots__ = ('fakeroot_state', '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 dd12b74e9..8293fcd35 100644 --- a/pym/_emerge/EbuildSpawnProcess.py +++ b/pym/_emerge/EbuildSpawnProcess.py @@ -9,10 +9,8 @@ class EbuildSpawnProcess(AbstractEbuildProcess): """ Used by doebuild.spawn() to manage the spawned process. """ - _spawn_kwarg_names = AbstractEbuildProcess._spawn_kwarg_names + \ - ('fakeroot_state',) - __slots__ = ('fakeroot_state', 'spawn_func') + __slots__ = ('spawn_func',) def _spawn(self, args, **kwargs): return self.spawn_func(args, env=self.settings.environ(), **kwargs) |