summaryrefslogtreecommitdiff
path: root/rdiff-backup/rdiff_backup/hash.py
diff options
context:
space:
mode:
authorbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-01 04:46:16 +0000
committerbescoto <bescoto@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2005-11-01 04:46:16 +0000
commit07d8d9cb11114ef5f98993e2e50a67762b3d9aaa (patch)
tree8bb6237a84163ad01d482bb2c5497305e6524f4e /rdiff-backup/rdiff_backup/hash.py
parenta5c03feacbbd9361eb3e2abe367b75529c83459b (diff)
downloadrdiff-backup-07d8d9cb11114ef5f98993e2e50a67762b3d9aaa.tar.gz
Added --verify and --verify-at-time switches
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@665 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
Diffstat (limited to 'rdiff-backup/rdiff_backup/hash.py')
-rw-r--r--rdiff-backup/rdiff_backup/hash.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/rdiff-backup/rdiff_backup/hash.py b/rdiff-backup/rdiff_backup/hash.py
index 3e7306f..0279f70 100644
--- a/rdiff-backup/rdiff_backup/hash.py
+++ b/rdiff-backup/rdiff_backup/hash.py
@@ -57,12 +57,16 @@ class Report:
def compute_sha1(rp, compressed = 0):
"""Return the hex sha1 hash of given rpath"""
assert rp.conn is Globals.local_connection # inefficient not to do locally
- blocksize = Globals.blocksize
- fp = FileWrapper(rp.open("r", compressed))
- while 1:
- if not fp.read(blocksize): break
- digest = fp.close().sha1_digest
+ digest = compute_sha1_fp(rp.open("r", compressed))
rp.set_sha1(digest)
return digest
+def compute_sha1_fp(fp, compressed = 0):
+ """Return hex sha1 hash of given file-like object"""
+ blocksize = Globals.blocksize
+ fw = FileWrapper(fp)
+ while 1:
+ if not fw.read(blocksize): break
+ return fw.close().sha1_digest
+