diff options
Diffstat (limited to 'pym/portage')
| -rw-r--r-- | pym/portage/__init__.py | 7 | ||||
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 12 |
2 files changed, 19 insertions, 0 deletions
diff --git a/pym/portage/__init__.py b/pym/portage/__init__.py index 4f32158b0..18cb707e0 100644 --- a/pym/portage/__init__.py +++ b/pym/portage/__init__.py @@ -6351,6 +6351,13 @@ def prepare_build_dirs(myroot, mysettings, cleanup): writemsg(_("File Not Found: '%s'\n") % str(e), noiselevel=-1) return 1 + # Reset state for things like noauto and keepwork in FEATURES. + for x in ('.die_hooks',): + try: + os.unlink(os.path.join(mysettings['PORTAGE_BUILDDIR'], x)) + except OSError: + pass + _prepare_workdir(mysettings) if mysettings.get('EBUILD_PHASE') != 'fetch': # Avoid spurious permissions adjustments when fetching with diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 27f2241c7..3244fa4ee 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4403,6 +4403,18 @@ class dblink(object): retval = self.treewalk(mergeroot, myroot, inforoot, myebuild, cleanup=cleanup, mydbapi=mydbapi, prev_mtimes=prev_mtimes) + if retval == os.EX_OK: + phase = 'success_hooks' + else: + phase = 'die_hooks' + + if self._scheduler is None: + portage._spawn_misc_sh(self.settings, [phase], + phase=phase) + else: + self._scheduler.dblinkEbuildPhase( + self, mydbapi, myebuild, phase) + # Process ebuild logfiles elog_process(self.mycpv, self.settings, phasefilter=filter_mergephases) if 'noclean' not in self.settings.features and \ |