Merged from trunk 11357:11360

   | 11358   | Remove redundant default pkg_nofetch, src_unpack, and        |
   | zmedico | src_test definitions which are now handled inside            |
   |         | _ebuild_phase_funcs().                                       |

   | 11359   | Increase Scheduler._job_delay_factor from 0.5 to 0.75 so     |
   | zmedico | that the delay ramps up a little quicker, since the current  |
   |         | value appears to be too weak in some cases.                  |

   | 11360   | When calling dbaip.aux_get() inside                          |
   | zmedico | depgraph._select_package(), only pull the keys that are      |
   |         | cached. This avoids triggering useless cache pulls for       |
   |         | INHERITED from the bindbapi.                                 |

svn path=/main/branches/prefix/; revision=11362

diff --git a/bin/ebuild.sh b/bin/ebuild.sh
index 8d125d6216deb92486f132ab63f61a5ba27e7843..9dc21cc53931012b295704b3978a9c94ccc73ed3 100755 (executable)
--- a/bin/ebuild.sh
+++ b/bin/ebuild.sh
@@ -641,14 +641,6 @@ _eapi2_src_compile() {
        fi
 }
 
-pkg_nofetch() {
-       _eapi0_pkg_nofetch
-}
-
-src_unpack() {
-       _eapi0_src_unpack
-}
-
 src_install() {
        if hasq "$EAPI" prefix; then
                # this avoids misc errors in prefix because it doesn't exist
@@ -658,10 +650,6 @@ src_install() {
        fi
 }
 
-src_test() {
-       _eapi0_src_test
-}
-
 ebuild_phase() {
        [ "$(type -t ${1})" == "function" ] && qa_call ${1}
 }

diff --git a/pym/_emerge/__init__.py b/pym/_emerge/__init__.py
index 51ac32ea3c6a9f716e35c676acb53a88381f74ef..d0655453cbce62c2a130098026116ee72f604d5e 100644 (file)
--- a/pym/_emerge/__init__.py
+++ b/pym/_emerge/__init__.py
@@ -5411,8 +5411,7 @@ class depgraph(object):
                                        if pkg is None:
                                                calculated_use = False
                                                try:
-                                                       metadata = izip(self._mydbapi_keys,
-                                                               db.aux_get(cpv, self._mydbapi_keys))
+                                                       metadata = izip(db_keys, db.aux_get(cpv, db_keys))
                                                except KeyError:
                                                        continue
                                                pkg = Package(built=built, cpv=cpv,
@@ -8921,7 +8920,7 @@ class Scheduler(PollScheduler):
                # jobs are added, so we need to limit the rate of adding
                # new jobs.
                self._job_delay_max = 5
-               self._job_delay_factor = 0.5
+               self._job_delay_factor = 0.75
                self._previous_job_start_time = None
 
                self._set_digraph(digraph)