diff options
| author | Zac Medico <zmedico@gentoo.org> | 2006-04-13 21:59:18 +0000 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2006-04-13 21:59:18 +0000 |
| commit | 0241a10d9fd597ff534446d82619fc42b2880a36 (patch) | |
| tree | 6e0de5b1c9312338c1abd99dfbecf19e763b6b2c /pym/portage_manifest.py | |
| parent | e5ffe576e032738060f0c9b5ced5e9dc9b065f32 (diff) | |
| download | portage-0241a10d9fd597ff534446d82619fc42b2880a36.tar.gz portage-0241a10d9fd597ff534446d82619fc42b2880a36.tar.bz2 portage-0241a10d9fd597ff534446d82619fc42b2880a36.zip | |
Fix digestcheck logic for bug #129839.
svn path=/main/trunk/; revision=3142
Diffstat (limited to 'pym/portage_manifest.py')
| -rw-r--r-- | pym/portage_manifest.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py index 491074da9..50d061ecc 100644 --- a/pym/portage_manifest.py +++ b/pym/portage_manifest.py @@ -86,11 +86,16 @@ class Manifest(object): def _read(self): """ Parse Manifest file for this instance """ - if not os.path.exists(self.getFullname()): - return - fd = open(self.getFullname(), "r") - mylines = fd.readlines() - fd.close() + mylines = [] + try: + fd = open(self.getFullname(), "r") + mylines.extend(fd.readlines()) + fd.close() + except (OSError, IOError), e: + if e.errno == errno.ENOENT: + pass + else: + raise mylines.extend(self._readDigests().split("\n")) self._parseDigests(mylines, myhashdict=self.fhashdict) |