Avoid checking the same Manifest several times in a row during a regen with an empty...

svn path=/main/trunk/; revision=5153

diff --git a/pym/portage.py b/pym/portage.py
index 1bad4ebd6d940996f042774182795fe2a08477fe..8d5e6ff5add4fab35883d69fc8df6f0a35093601 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -2972,6 +2972,7 @@ def prepare_build_dirs(myroot, mysettings, cleanup):
                del logid_path, logid_time
 
 _doebuild_manifest_exempt_depend = False
+_doebuild_manifest_checked = None
 
 def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
        fetchonly=0, cleanup=0, dbkey=None, use_cache=1, fetchall=0, tree=None,
@@ -3021,24 +3022,29 @@ def doebuild(myebuild, mydo, myroot, mysettings, debug=0, listonly=0,
                # Always verify the ebuild checksums before executing it.
                pkgdir = os.path.dirname(myebuild)
                manifest_path = os.path.join(pkgdir, "Manifest")
-               if not os.path.exists(manifest_path):
-                       writemsg("!!! Manifest file not found: '%s'\n" % manifest_path,
-                               noiselevel=-1)
-                       return 1
-               mf = Manifest(pkgdir, mysettings["DISTDIR"])
-               try:
-                       mf.checkTypeHashes("EBUILD")
-               except portage_exception.FileNotFound, e:
-                       writemsg("!!! A file listed in the Manifest " + \
-                               "could not be found: %s\n" % str(e), noiselevel=-1)
-                       return 1
-               except portage_exception.DigestException, e:
-                       writemsg("!!! Digest verification failed:\n", noiselevel=-1)
-                       writemsg("!!! %s\n" % e.value[0], noiselevel=-1)
-                       writemsg("!!! Reason: %s\n" % e.value[1], noiselevel=-1)
-                       writemsg("!!! Got: %s\n" % e.value[2], noiselevel=-1)
-                       writemsg("!!! Expected: %s\n" % e.value[3], noiselevel=-1)
-                       return 1
+               global _doebuild_manifest_checked
+               # Avoid checking the same Manifest several times in a row during a
+               # regen with an empty cache.
+               if _doebuild_manifest_checked != manifest_path:
+                       if not os.path.exists(manifest_path):
+                               writemsg("!!! Manifest file not found: '%s'\n" % manifest_path,
+                                       noiselevel=-1)
+                               return 1
+                       mf = Manifest(pkgdir, mysettings["DISTDIR"])
+                       try:
+                               mf.checkTypeHashes("EBUILD")
+                       except portage_exception.FileNotFound, e:
+                               writemsg("!!! A file listed in the Manifest " + \
+                                       "could not be found: %s\n" % str(e), noiselevel=-1)
+                               return 1
+                       except portage_exception.DigestException, e:
+                               writemsg("!!! Digest verification failed:\n", noiselevel=-1)
+                               writemsg("!!! %s\n" % e.value[0], noiselevel=-1)
+                               writemsg("!!! Reason: %s\n" % e.value[1], noiselevel=-1)
+                               writemsg("!!! Got: %s\n" % e.value[2], noiselevel=-1)
+                               writemsg("!!! Expected: %s\n" % e.value[3], noiselevel=-1)
+                               return 1
+                       _doebuild_manifest_checked = manifest_path
 
        doebuild_environment(myebuild, mydo, myroot, mysettings, debug,
                use_cache, mydbapi)