Don't bother to parse ${FILESDIR}/digest-* when manifest1_compat is disabled. (trunk...

svn path=/main/branches/2.1.2/; revision=6046

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index 3eb95751bdfa11cebe3a8f18f9314d7e9c7c6400..aed465d46287c1e6d4dbbd9bed6899661d5dfed0 100644 (file)
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -117,9 +117,9 @@ class Manifest(object):
                self.hashes = sets.Set(self.hashes)
                for t in portage_const.MANIFEST2_IDENTIFIERS:
                        self.fhashdict[t] = {}
+               self.compat = manifest1_compat
                if not from_scratch:
                        self._read()
-               self.compat = manifest1_compat
                self.fetchlist_dict = fetchlist_dict
                self.distdir = distdir
                self.guessType = guessManifestFileType
@@ -178,8 +178,8 @@ class Manifest(object):
                        self._readManifest(self.getFullname(), myhashdict=self.fhashdict)
                except FileNotFound:
                        pass
-               self._readDigests(myhashdict=self.fhashdict)
-               
+               if self.compat:
+                       self._readDigests(myhashdict=self.fhashdict)
 
        def _parseManifestLines(self, mylines):
                """Parse manifest lines and return a list of manifest entries."""