diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-29 03:13:17 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-29 03:13:17 +0000 |
| commit | 44e9e854b09020727a0acff739e4230213627086 (patch) | |
| tree | fdcc4d11e292f202a84a5ba3690a06e5af873c04 /pym/_emerge | |
| parent | 1555ce76c13915236a45c22c441c6bb06b3b6555 (diff) | |
| download | portage-44e9e854b09020727a0acff739e4230213627086.tar.gz portage-44e9e854b09020727a0acff739e4230213627086.tar.bz2 portage-44e9e854b09020727a0acff739e4230213627086.zip | |
Instead of calling the ebuild "clean" phase in MergeTask.merge(),
move it inside doebuild() where it can be tied into the actionmap_deps
framework.
svn path=/main/trunk/; revision=10842
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/__init__.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index 57463bab9..c88d8af8f 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6562,16 +6562,13 @@ class MergeTask(object): build_dir = EbuildBuildDir(pkg=pkg, settings=pkgsettings) try: build_dir.lock() + # Cleaning is triggered before the setup + # phase, in portage.doebuild(). msg = " === (%s of %s) Cleaning (%s::%s)" % \ (mergecount, len(mymergelist), pkg_key, y) short_msg = "emerge: (%s of %s) %s Clean" % \ (mergecount, len(mymergelist), pkg_key) emergelog(xterm_titles, msg, short_msg=short_msg) - retval = portage.doebuild(y, "clean", myroot, - pkgsettings, self.edebug, cleanup=1, - mydbapi=portdb, tree="porttree") - if retval != os.EX_OK: - raise self._pkg_failure(retval) if "--buildpkg" in self.myopts or issyspkg: if issyspkg: |