| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-29 04:27:57 +0000 (Sun, 29 Jun 2008) |
| 3 |
New Revision: 10843 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
main/trunk/pym/portage/__init__.py |
| 8 |
Log: |
| 9 |
Move clean code, from the previous commit, from doebuild() to |
| 10 |
EbuildBuild.execute() where it fits better. |
| 11 |
|
| 12 |
|
| 13 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 14 |
=================================================================== |
| 15 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-29 03:13:17 UTC (rev 10842) |
| 16 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-29 04:27:57 UTC (rev 10843) |
| 17 |
@@ -1538,12 +1538,17 @@ |
| 18 |
def execute(self): |
| 19 |
root_config = self.pkg.root_config |
| 20 |
portdb = root_config.trees["porttree"].dbapi |
| 21 |
- vartree = root_config.trees["vartree"] |
| 22 |
ebuild_path = portdb.findname(self.pkg.cpv) |
| 23 |
debug = self.settings.get("PORTAGE_DEBUG") == "1" |
| 24 |
|
| 25 |
+ retval = portage.doebuild(ebuild_path, "clean", |
| 26 |
+ root_config.root, self.settings, debug, cleanup=1, |
| 27 |
+ mydbapi=portdb, tree="porttree") |
| 28 |
+ if retval != os.EX_OK: |
| 29 |
+ return retval |
| 30 |
+ |
| 31 |
retval = portage.doebuild(ebuild_path, "install", |
| 32 |
- root_config.root, self.settings, debug, vartree=vartree, |
| 33 |
+ root_config.root, self.settings, debug, |
| 34 |
mydbapi=portdb, tree="porttree") |
| 35 |
return retval |
| 36 |
|
| 37 |
|
| 38 |
Modified: main/trunk/pym/portage/__init__.py |
| 39 |
=================================================================== |
| 40 |
--- main/trunk/pym/portage/__init__.py 2008-06-29 03:13:17 UTC (rev 10842) |
| 41 |
+++ main/trunk/pym/portage/__init__.py 2008-06-29 04:27:57 UTC (rev 10843) |
| 42 |
@@ -4934,18 +4934,10 @@ |
| 43 |
use_cache, mydbapi) |
| 44 |
|
| 45 |
clean_phases = ("clean", "cleanrm") |
| 46 |
- if mydo in clean_phases or \ |
| 47 |
- (not noauto and mydo in actionmap_deps and \ |
| 48 |
- mysettings.get("EMERGE_FROM") == "ebuild"): |
| 49 |
- if mydo not in clean_phases: |
| 50 |
- mysettings["EBUILD_PHASE"] = "clean" |
| 51 |
- try: |
| 52 |
- retval = spawn(_shell_quote(ebuild_sh_binary) + " clean", |
| 53 |
- mysettings, debug=debug, free=1, logfile=None) |
| 54 |
- finally: |
| 55 |
- mysettings["EBUILD_PHASE"] = mydo |
| 56 |
- if mydo in clean_phases or retval != os.EX_OK: |
| 57 |
- return retval |
| 58 |
+ if mydo in clean_phases: |
| 59 |
+ retval = spawn(_shell_quote(ebuild_sh_binary) + " clean", |
| 60 |
+ mysettings, debug=debug, free=1, logfile=None) |
| 61 |
+ return retval |
| 62 |
|
| 63 |
# get possible slot information from the deps file |
| 64 |
if mydo == "depend": |
| 65 |
|
| 66 |
-- |
| 67 |
gentoo-commits@l.g.o mailing list |
Archives