diff options
| author | Zac Medico <zmedico@gentoo.org> | 2009-12-07 02:43:55 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2009-12-07 02:43:55 +0000 |
| commit | b61d8aacf09dbeca1579823998c5f61bd13bc4b4 (patch) | |
| tree | 6ee03424b8f1ac5ec2def79c863f724082eecdd1 | |
| parent | 9d71fd0cc12d991cac13e0de6b0b7042a39a62a6 (diff) | |
| download | portage-b61d8aacf09dbeca1579823998c5f61bd13bc4b4.tar.gz portage-b61d8aacf09dbeca1579823998c5f61bd13bc4b4.tar.bz2 portage-b61d8aacf09dbeca1579823998c5f61bd13bc4b4.zip | |
Make more code conditional on existence of PORTAGE_BUILDDIR inside
dblink._merge().
svn path=/main/trunk/; revision=14955
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index a424dea0a..85c41d470 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -4421,22 +4421,23 @@ class dblink(object): 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 \ - (retval == os.EX_OK or \ - ('fail-clean' in self.settings.features and \ - os.path.isdir(self.settings['PORTAGE_BUILDDIR']))): - if myebuild is None: - myebuild = os.path.join(inforoot, self.pkg + ".ebuild") + elog_process(self.mycpv, self.settings, + phasefilter=filter_mergephases) + + if 'noclean' not in self.settings.features and \ + (retval == os.EX_OK or \ + 'fail-clean' in self.settings.features): + if myebuild is None: + myebuild = os.path.join(inforoot, self.pkg + ".ebuild") + + if self._scheduler is None: + doebuild(myebuild, "clean", myroot, + self.settings, tree=self.treetype, + mydbapi=mydbapi, vartree=self.vartree) + else: + self._scheduler.dblinkEbuildPhase( + self, mydbapi, myebuild, "clean") - if self._scheduler is None: - doebuild(myebuild, "clean", myroot, - self.settings, tree=self.treetype, - mydbapi=mydbapi, vartree=self.vartree) - else: - self._scheduler.dblinkEbuildPhase( - self, mydbapi, myebuild, "clean") finally: self.vartree.dbapi.linkmap._clear_cache() self.unlockdb() |