Secure testing commits - Feb 2011 - r16126 - lib/python

Author: fw
Date: 2011-02-13 18:56:29 +0000 (Sun, 13 Feb 2011)
New Revision: 16126

Modified:
   lib/python/debian_support.py
Log:
debian_support.updateFile(): make full download if patch hash is incorrect


Modified: lib/python/debian_support.py
==================================================================---
lib/python/debian_support.py	2011-02-13 18:38:38 UTC (rev 16125)
+++ lib/python/debian_support.py	2011-02-13 18:56:29 UTC (rev 16126)
@@ -389,7 +389,9 @@
         except IOError, e:
             return downloadFile(remote, local)
         if readLinesSHA1(patch_contents ) <> patch_hashes[patch_name]:
-            raise ValueError, "patch %s was garbled" % `patch_name`
+            if verbose:
+                print "updateFile: patch was garbled: " +
repr(patch_name)
+            return downloadFile(remote, local)
         patchLines(lines, patchesFromEdScript(patch_contents))
         
     new_hash = readLinesSHA1(lines)