diff options
| author |   Zac Medico <zmedico@gentoo.org> | 2007-02-22 22:15:43 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2007-02-22 22:15:43 +0000 |
| commit | 74d8f1edbb5f2d31384c72e0b2449be49ed79905 (patch) | |
| tree | 6c1762373134dd0d24ea9165841dff6223d75b89 | |
| parent | For bug #167667, add support for ${PORTDIR}/manifest1_obsolete and automatica... (diff) | |
| download | portage-multirepo-74d8f1edbb5f2d31384c72e0b2449be49ed79905.tar.gz portage-multirepo-74d8f1edbb5f2d31384c72e0b2449be49ed79905.tar.bz2 portage-multirepo-74d8f1edbb5f2d31384c72e0b2449be49ed79905.zip | |
Don't bother to parse ${FILESDIR}/digest-* when manifest1_compat is disabled. (trunk r6044:6045)
svn path=/main/branches/2.1.2/; revision=6046
| -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 3eb95751..aed465d4 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 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.""" |