diff options
author | Zac Medico <zmedico@gentoo.org> | 2011-03-26 00:06:01 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2011-03-26 00:06:01 -0700 |
commit | dc6a4c122e827baf28729caf2dbb32576072d88f (patch) | |
tree | b17c8a93f246b70faf58cbcbc49ecef7b0e8a05e /pym/_emerge/Binpkg.py | |
parent | 2e6fe9eb779b94d1f00d9ebdbdf76b3f026ebcd2 (diff) | |
download | portage-dc6a4c122e827baf28729caf2dbb32576072d88f.tar.gz portage-dc6a4c122e827baf28729caf2dbb32576072d88f.tar.bz2 portage-dc6a4c122e827baf28729caf2dbb32576072d88f.zip |
Reoranize PackageMerge/MergeListItem interaction.
Diffstat (limited to 'pym/_emerge/Binpkg.py')
-rw-r--r-- | pym/_emerge/Binpkg.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/pym/_emerge/Binpkg.py b/pym/_emerge/Binpkg.py index 62d44c48f..bc6b85da2 100644 --- a/pym/_emerge/Binpkg.py +++ b/pym/_emerge/Binpkg.py @@ -307,7 +307,7 @@ class Binpkg(CompositeTask): portage.elog.elog_process(self.pkg.cpv, self.settings) self._build_dir.unlock() - def install(self, handler): + def create_install_task(self): # This gives bashrc users an opportunity to do various things # such as remove binary packages after they're installed. @@ -322,16 +322,13 @@ class Binpkg(CompositeTask): settings=settings, tree=self._tree, world_atom=self.world_atom) task = merge.create_task() task.addExitListener(self._install_exit) - self._start_task(task, handler) + return task def _install_exit(self, task): self.settings.pop("PORTAGE_BINPKG_FILE", None) self._unlock_builddir() - - if self._default_final_exit(task) != os.EX_OK: - return - - if 'binpkg-logs' not in self.settings.features and \ + if task.returncode == os.EX_OK and \ + 'binpkg-logs' not in self.settings.features and \ self.settings.get("PORTAGE_LOG_FILE"): try: os.unlink(self.settings["PORTAGE_LOG_FILE"]) |