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

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

diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py
index 24f933294623dae1b5beab46c476d74b270bd648..3405d7926d63ce19c97d4ccbed0a4556771516fc 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
                if fetchlist_dict != None:
                        self.fetchlist_dict = fetchlist_dict
                else:
@@ -181,8 +181,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."""