diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-11-16 23:47:50 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-11-16 23:47:50 +0000 |
| commit | 5825bc0d551ecf72364f8d21afbc1b20e2e00eb1 (patch) | |
| tree | a24b39811cf133c579a89e180e3fca8d7231c25b /lib/thandy/repository.py | |
| parent | b63eda4396dc7b17554e657bc2eec0b0fda7bcb4 (diff) | |
Fix bundle download logic. Better fix needed.
git-svn-id: file:///home/or/svnrepo/updater/trunk@17299 55e972cd-5a19-0410-ae62-a4d7a52db4cd
Diffstat (limited to 'lib/thandy/repository.py')
| -rw-r--r-- | lib/thandy/repository.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/thandy/repository.py b/lib/thandy/repository.py index 696bbec..3e1f441 100644 --- a/lib/thandy/repository.py +++ b/lib/thandy/repository.py @@ -390,7 +390,9 @@ class LocalRepository: continue rp = binfo.getRelativePath() - hashDict[rp] = h_expected = binfo.getHash() + #hashDict[rp] = #XXXX this hash needs to be calculated ovver + # # the json data. + h_expected = binfo.getHash() bfile = self.getBundleFile(rp) try: bfile.load() @@ -401,7 +403,8 @@ class LocalRepository: h_b = thandy.formats.getDigest(bfile.get()) if h_b != h_expected: - logging.info("Bundle hash not as expected; must fetch.", rp) + logging.info("Bundle hash for %s not as expected; must fetch.", + rp) need.add(rp) continue @@ -422,7 +425,8 @@ class LocalRepository: rp = pkginfo['path'] pfile = self.getPackageFile(rp) h_expected = thandy.formats.parseHash(pkginfo['hash']) - hashDict[rp] = h_expected + #hashDict[rp] = #XXXX this hash needs to be calculated ovver + # # the json data. try: pfile.load() except OSError: @@ -477,7 +481,7 @@ class LocalRepository: fn = self.getFilename(rp) try: h_got = thandy.formats.getFileDigest(fn) - except OSError: + except (OSError, IOError): logging.info("Installable file %s not found on disk; " "must load", rp) need.add(rp) |