From 3c10179ea76fa6157ee5b6767082c2c3c4b1becd Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Thu, 22 Feb 2007 22:15:08 +0000 Subject: Don't bother to parse ${FILESDIR}/digest-* when manifest1_compat is disabled. svn path=/main/trunk/; revision=6045 --- pym/portage/manifest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pym/portage/manifest.py b/pym/portage/manifest.py index 24f933294..3405d7926 100644 --- 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.""" -- cgit v1.2.3-1-g7c22