diff options
| author | Zac Medico <zmedico@gentoo.org> | 2008-06-28 09:16:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2008-06-28 09:16:08 +0000 |
| commit | bada3a14d2cb2232871493bc5c10aba6b95dac13 (patch) | |
| tree | d281487dff2a6c1b7783b4b31b9f60153ec72e81 | |
| parent | bcf69af38179859dcc5dd4ebd591933f24f464ad (diff) | |
| download | portage-bada3a14d2cb2232871493bc5c10aba6b95dac13.tar.gz portage-bada3a14d2cb2232871493bc5c10aba6b95dac13.tar.bz2 portage-bada3a14d2cb2232871493bc5c10aba6b95dac13.zip | |
Use the EbuildMerge class instead of portage.merge().
svn path=/main/trunk/; revision=10834
| -rw-r--r-- | pym/_emerge/__init__.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py index edbabdd99..a0191d1f0 100644 --- a/pym/_emerge/__init__.py +++ b/pym/_emerge/__init__.py @@ -6528,14 +6528,11 @@ class MergeTask(object): (mergecount, len(mymergelist), pkg_key) emergelog(xterm_titles, msg, short_msg=short_msg) - retval = portage.merge(pkgsettings["CATEGORY"], - pkgsettings["PF"], pkgsettings["D"], - os.path.join(pkgsettings["PORTAGE_BUILDDIR"], - "build-info"), myroot, pkgsettings, - myebuild=pkgsettings["EBUILD"], - mytree="porttree", mydbapi=portdb, - vartree=vartree, prev_mtimes=ldpath_mtimes, - blockers=self._find_blockers(pkg)) + merge = EbuildMerge( + find_blockers=self._find_blockers(pkg), + ldpath_mtimes=ldpath_mtimes, + pkg=pkg, pretend=pretend, settings=pkgsettings) + retval = merge.execute() if retval != os.EX_OK: raise self._pkg_failure(retval) elif "noclean" not in pkgsettings.features: |