| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-28 23:32:58 +0000 (Sat, 28 Jun 2008) |
| 3 |
New Revision: 10839 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Make EbuildBinpkg delegate everything up to src_install() to |
| 9 |
the EbuildBuild class. |
| 10 |
|
| 11 |
|
| 12 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 13 |
=================================================================== |
| 14 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-28 22:38:51 UTC (rev 10838) |
| 15 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-28 23:32:58 UTC (rev 10839) |
| 16 |
@@ -1476,7 +1476,9 @@ |
| 17 |
return retval |
| 18 |
|
| 19 |
class EbuildBinpkg(Task): |
| 20 |
- |
| 21 |
+ """ |
| 22 |
+ This assumes that src_install() has successfully completed. |
| 23 |
+ """ |
| 24 |
__slots__ = ("pkg", "settings") |
| 25 |
|
| 26 |
def _get_hash_key(self): |
| 27 |
@@ -1500,13 +1502,21 @@ |
| 28 |
settings["PORTAGE_BINPKG_TMPFILE"] = binpkg_tmpfile |
| 29 |
settings.backup_changes("PORTAGE_BINPKG_TMPFILE") |
| 30 |
|
| 31 |
+ # Earlier phases should already be done, so |
| 32 |
+ # use "noauto" to quietly skip them. |
| 33 |
+ settings.features.append("noauto") |
| 34 |
+ |
| 35 |
try: |
| 36 |
retval = portage.doebuild(ebuild_path, |
| 37 |
"package", root_config.root, |
| 38 |
settings, debug, mydbapi=portdb, |
| 39 |
tree="porttree") |
| 40 |
finally: |
| 41 |
- self.settings.pop("PORTAGE_BINPKG_TMPFILE", None) |
| 42 |
+ settings.pop("PORTAGE_BINPKG_TMPFILE", None) |
| 43 |
+ try: |
| 44 |
+ settings.features.remove("noauto") |
| 45 |
+ except ValueError: |
| 46 |
+ pass |
| 47 |
|
| 48 |
if retval == os.EX_OK: |
| 49 |
bintree.inject(pkg.cpv, filename=binpkg_tmpfile) |
| 50 |
@@ -6517,6 +6527,11 @@ |
| 51 |
(mergecount, len(mymergelist), pkg_key) |
| 52 |
emergelog(xterm_titles, msg, short_msg=short_msg) |
| 53 |
|
| 54 |
+ build = EbuildBuild(pkg=pkg, settings=pkgsettings) |
| 55 |
+ retval = build.execute() |
| 56 |
+ if retval != os.EX_OK: |
| 57 |
+ raise self._pkg_failure(retval) |
| 58 |
+ |
| 59 |
build = EbuildBinpkg(pkg=pkg, settings=pkgsettings) |
| 60 |
retval = build.execute() |
| 61 |
if retval != os.EX_OK: |
| 62 |
|
| 63 |
-- |
| 64 |
gentoo-commits@l.g.o mailing list |
Archives