diff options
| author | Zac Medico <zmedico@gentoo.org> | 2007-02-22 22:15:08 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 22:15:08 +0000 |
| commit | 3c10179ea76fa6157ee5b6767082c2c3c4b1becd (patch) | |
| tree | 4f84083dd5bc9fe4a9fc5e1e1732d84f7c0d01d3 | |
| parent | 48700154213496665fba2e9d184d78024c7e1fa7 (diff) | |
| download | portage-3c10179ea76fa6157ee5b6767082c2c3c4b1becd.tar.gz portage-3c10179ea76fa6157ee5b6767082c2c3c4b1becd.tar.bz2 portage-3c10179ea76fa6157ee5b6767082c2c3c4b1becd.zip | |
Don't bother to parse ${FILESDIR}/digest-* when manifest1_compat is disabled.
svn path=/main/trunk/; revision=6045
| -rw-r--r-- | pym/portage/manifest.py | 6 |
1 files 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.""" |