* [gentoo-commits] portage r10834 - main/trunk/pym/_emerge
@ 2008-06-28 9:16 Zac Medico (zmedico)
0 siblings, 0 replies; only message in thread
From: Zac Medico (zmedico) @ 2008-06-28 9:16 UTC (permalink / raw
To: gentoo-commits
Author: zmedico
Date: 2008-06-28 09:16:08 +0000 (Sat, 28 Jun 2008)
New Revision: 10834
Modified:
main/trunk/pym/_emerge/__init__.py
Log:
Use the EbuildMerge class instead of portage.merge().
Modified: main/trunk/pym/_emerge/__init__.py
===================================================================
--- main/trunk/pym/_emerge/__init__.py 2008-06-28 09:08:24 UTC (rev 10833)
+++ main/trunk/pym/_emerge/__init__.py 2008-06-28 09:16:08 UTC (rev 10834)
@@ -6528,14 +6528,11 @@
(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:
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-28 9:16 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-28 9:16 [gentoo-commits] portage r10834 - main/trunk/pym/_emerge Zac Medico (zmedico)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox