| 1 |
Author: grobian |
| 2 |
Date: 2009-05-02 09:30:11 +0000 (Sat, 02 May 2009) |
| 3 |
New Revision: 13594 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/branches/prefix/pym/portage/__init__.py |
| 7 |
main/branches/prefix/pym/portage/dbapi/porttree.py |
| 8 |
Log: |
| 9 |
Merged from trunk -r13575:13580 |
| 10 |
|
| 11 |
| 13578 | Fix logic error which prevents repos.conf [DEFAULT] section | |
| 12 |
| zmedico | from applying to repos that don't have their own section. | |
| 13 |
| | Thanks to Markos Chandras <hwoarang@g.o> for reporting. | |
| 14 |
|
| 15 |
| 13580 | Only generate KV when setting up the environment for a real | |
| 16 |
| zmedico | ebuild phase. This should preven "Permission Denied: | |
| 17 |
| | /usr/src/linux/.config" errors reported by repoman users | |
| 18 |
| | (repoman may trigger the error when it calls the fetch | |
| 19 |
| | phase). | |
| 20 |
|
| 21 |
|
| 22 |
Modified: main/branches/prefix/pym/portage/__init__.py |
| 23 |
=================================================================== |
| 24 |
--- main/branches/prefix/pym/portage/__init__.py 2009-05-02 09:23:14 UTC (rev 13593) |
| 25 |
+++ main/branches/prefix/pym/portage/__init__.py 2009-05-02 09:30:11 UTC (rev 13594) |
| 26 |
@@ -5436,7 +5436,10 @@ |
| 27 |
mysettings["PORTAGE_BUILDDIR"], ".exit_status") |
| 28 |
|
| 29 |
#set up KV variable -- DEP SPEEDUP :: Don't waste time. Keep var persistent. |
| 30 |
- if mydo != "depend" and "KV" not in mysettings: |
| 31 |
+ if mydo != 'depend' and 'KV' not in mysettings and \ |
| 32 |
+ mydo in ('compile', 'config', 'configure', 'info', |
| 33 |
+ 'install', 'nofetch', 'postinst', 'postrm', 'preinst', |
| 34 |
+ 'prepare', 'prerm', 'setup', 'test', 'unpack'): |
| 35 |
mykv,err1=ExtractKernelVersion(os.path.join(myroot, EPREFIX_LSTRIP, "usr/src/linux")) |
| 36 |
if mykv: |
| 37 |
# Regular source tree |
| 38 |
|
| 39 |
Modified: main/branches/prefix/pym/portage/dbapi/porttree.py |
| 40 |
=================================================================== |
| 41 |
--- main/branches/prefix/pym/portage/dbapi/porttree.py 2009-05-02 09:23:14 UTC (rev 13593) |
| 42 |
+++ main/branches/prefix/pym/portage/dbapi/porttree.py 2009-05-02 09:30:11 UTC (rev 13594) |
| 43 |
@@ -227,7 +227,7 @@ |
| 44 |
if local_repo_configs is not None: |
| 45 |
if repo_name is not None: |
| 46 |
loc_repo_conf = local_repo_configs.get(repo_name) |
| 47 |
- else: |
| 48 |
+ if loc_repo_conf is None: |
| 49 |
loc_repo_conf = default_loc_repo_config |
| 50 |
|
| 51 |
layout_filename = os.path.join(path, "metadata/layout.conf") |
Archives