| 1 |
Author: zmedico |
| 2 |
Date: 2008-06-28 09:16:08 +0000 (Sat, 28 Jun 2008) |
| 3 |
New Revision: 10834 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/_emerge/__init__.py |
| 7 |
Log: |
| 8 |
Use the EbuildMerge class instead of portage.merge(). |
| 9 |
|
| 10 |
|
| 11 |
Modified: main/trunk/pym/_emerge/__init__.py |
| 12 |
=================================================================== |
| 13 |
--- main/trunk/pym/_emerge/__init__.py 2008-06-28 09:08:24 UTC (rev 10833) |
| 14 |
+++ main/trunk/pym/_emerge/__init__.py 2008-06-28 09:16:08 UTC (rev 10834) |
| 15 |
@@ -6528,14 +6528,11 @@ |
| 16 |
(mergecount, len(mymergelist), pkg_key) |
| 17 |
emergelog(xterm_titles, msg, short_msg=short_msg) |
| 18 |
|
| 19 |
- retval = portage.merge(pkgsettings["CATEGORY"], |
| 20 |
- pkgsettings["PF"], pkgsettings["D"], |
| 21 |
- os.path.join(pkgsettings["PORTAGE_BUILDDIR"], |
| 22 |
- "build-info"), myroot, pkgsettings, |
| 23 |
- myebuild=pkgsettings["EBUILD"], |
| 24 |
- mytree="porttree", mydbapi=portdb, |
| 25 |
- vartree=vartree, prev_mtimes=ldpath_mtimes, |
| 26 |
- blockers=self._find_blockers(pkg)) |
| 27 |
+ merge = EbuildMerge( |
| 28 |
+ find_blockers=self._find_blockers(pkg), |
| 29 |
+ ldpath_mtimes=ldpath_mtimes, |
| 30 |
+ pkg=pkg, pretend=pretend, settings=pkgsettings) |
| 31 |
+ retval = merge.execute() |
| 32 |
if retval != os.EX_OK: |
| 33 |
raise self._pkg_failure(retval) |
| 34 |
elif "noclean" not in pkgsettings.features: |
| 35 |
|
| 36 |
-- |
| 37 |
gentoo-commits@l.g.o mailing list |
Archives