| 1 |
Author: zmedico |
| 2 |
Date: 2009-03-23 05:55:31 +0000 (Mon, 23 Mar 2009) |
| 3 |
New Revision: 13171 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/2.1.6/pym/_emerge/__init__.py |
| 7 |
main/branches/2.1.6/pym/portage/__init__.py |
| 8 |
main/branches/2.1.6/pym/portage/dbapi/porttree.py |
| 9 |
Log: |
| 10 |
When calling doebuild() to spawn the 'depend' phase, just call config.setcpv() |
| 11 |
since that should be enough (no need for separate reset or reload calls). |
| 12 |
(trunk r13170) |
| 13 |
|
| 14 |
Modified: main/branches/2.1.6/pym/_emerge/__init__.py |
| 15 |
=================================================================== |
| 16 |
--- main/branches/2.1.6/pym/_emerge/__init__.py 2009-03-23 05:49:17 UTC (rev 13170) |
| 17 |
+++ main/branches/2.1.6/pym/_emerge/__init__.py 2009-03-23 05:55:31 UTC (rev 13171) |
| 18 |
@@ -3008,7 +3008,7 @@ |
| 19 |
|
| 20 |
def _start(self): |
| 21 |
settings = self.settings |
| 22 |
- settings.reset() |
| 23 |
+ settings.setcpv(self.cpv) |
| 24 |
ebuild_path = self.ebuild_path |
| 25 |
debug = settings.get("PORTAGE_DEBUG") == "1" |
| 26 |
master_fd = None |
| 27 |
|
| 28 |
Modified: main/branches/2.1.6/pym/portage/__init__.py |
| 29 |
=================================================================== |
| 30 |
--- main/branches/2.1.6/pym/portage/__init__.py 2009-03-23 05:49:17 UTC (rev 13170) |
| 31 |
+++ main/branches/2.1.6/pym/portage/__init__.py 2009-03-23 05:55:31 UTC (rev 13171) |
| 32 |
@@ -5035,14 +5035,14 @@ |
| 33 |
tmpdir = mysettings["PORTAGE_TMPDIR"] |
| 34 |
|
| 35 |
if mycpv != mysettings.mycpv: |
| 36 |
- # Reload env.d variables and reset any previous settings. |
| 37 |
- mysettings.reload() |
| 38 |
- mysettings.reset() |
| 39 |
if mydo == 'depend': |
| 40 |
# Don't pass in mydbapi here since the resulting aux_get |
| 41 |
# call would lead to infinite 'depend' phase recursion. |
| 42 |
mysettings.setcpv(mycpv) |
| 43 |
else: |
| 44 |
+ # Reload env.d variables and reset any previous settings. |
| 45 |
+ mysettings.reload() |
| 46 |
+ mysettings.reset() |
| 47 |
mysettings.setcpv(mycpv, mydb=mydbapi) |
| 48 |
|
| 49 |
# config.reset() might have reverted a change made by the caller, |
| 50 |
|
| 51 |
Modified: main/branches/2.1.6/pym/portage/dbapi/porttree.py |
| 52 |
=================================================================== |
| 53 |
--- main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-03-23 05:49:17 UTC (rev 13170) |
| 54 |
+++ main/branches/2.1.6/pym/portage/dbapi/porttree.py 2009-03-23 05:55:31 UTC (rev 13171) |
| 55 |
@@ -417,7 +417,7 @@ |
| 56 |
writemsg("doregen: %s %s\n" % (doregen, mycpv), 2) |
| 57 |
writemsg("Generating cache entry(0) for: "+str(myebuild)+"\n", 1) |
| 58 |
|
| 59 |
- self.doebuild_settings.reset() |
| 60 |
+ self.doebuild_settings.setcpv(mycpv) |
| 61 |
mydata = {} |
| 62 |
myret = doebuild(myebuild, "depend", |
| 63 |
self.doebuild_settings["ROOT"], self.doebuild_settings, |
Archives