| 1 |
Author: zmedico |
| 2 |
Date: 2008-10-07 08:04:55 +0000 (Tue, 07 Oct 2008) |
| 3 |
New Revision: 11646 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Fix EbuildFetcher._wait_hook() so it can be called more than once without |
| 9 |
throwing an AttributeError. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-10-07 02:01:01 UTC (rev 11645) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-10-07 08:04:55 UTC (rev 11646) |
| 16 |
@@ -2278,16 +2278,17 @@ |
| 17 |
def _wait_hook(self): |
| 18 |
# Collect elog messages that might have been |
| 19 |
# created by the pkg_nofetch phase. |
| 20 |
- portage.elog.elog_process(self.pkg.cpv, self._build_dir.settings) |
| 21 |
- try: |
| 22 |
- shutil.rmtree(self._build_dir.settings["PORTAGE_BUILDDIR"]) |
| 23 |
- except EnvironmentError, e: |
| 24 |
- if e.errno != errno.ENOENT: |
| 25 |
- raise |
| 26 |
- del e |
| 27 |
- self._build_dir.unlock() |
| 28 |
- self.config_pool.deallocate(self._build_dir.settings) |
| 29 |
- self._build_dir = None |
| 30 |
+ if self._build_dir is not None: |
| 31 |
+ portage.elog.elog_process(self.pkg.cpv, self._build_dir.settings) |
| 32 |
+ try: |
| 33 |
+ shutil.rmtree(self._build_dir.settings["PORTAGE_BUILDDIR"]) |
| 34 |
+ except EnvironmentError, e: |
| 35 |
+ if e.errno != errno.ENOENT: |
| 36 |
+ raise |
| 37 |
+ del e |
| 38 |
+ self._build_dir.unlock() |
| 39 |
+ self.config_pool.deallocate(self._build_dir.settings) |
| 40 |
+ self._build_dir = None |
| 41 |
SpawnProcess._wait_hook(self) |
| 42 |
|
| 43 |
class EbuildBuildDir(SlotObject): |
Archives