From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 28 Jun 2008 09:16:08 +0000 (-0000)
Subject: Use the EbuildMerge class instead of portage.merge().
X-Git-Tag: v2.2_rc2~291
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bada3a14d2cb2232871493bc5c10aba6b95dac13;p=portage.git

Use the EbuildMerge class instead of portage.merge().

svn path=/main/trunk/; revision=10834
---

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: