summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-04 18:26:00 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-04 18:26:00 +0000
commitc4ba05b9f99e34bca4c5c8faaed89c1c8b4d0ed2 (patch)
treee94f88005bc028dca34c544726f2f5be49f5647e
parent77235e91be5d7731cc77bc7f922d29a728186005 (diff)
downloadrdiff-backup-c4ba05b9f99e34bca4c5c8faaed89c1c8b4d0ed2.tar.gz
Fix --compare-hash options on Windows.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@1035 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG6
-rw-r--r--rdiff-backup/rdiff_backup/hash.py2
2 files changed, 7 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 552b771..92ec3ba 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,3 +1,9 @@
+New in v1.2.8 (????/??/??)
+---------------------------
+
+Fix --compare-hash options on Windows. Thanks to Serge Zub for the fix.
+
+
New in v1.2.7 (2009/03/02)
---------------------------
diff --git a/rdiff-backup/rdiff_backup/hash.py b/rdiff-backup/rdiff_backup/hash.py
index 7758dc9..b438743 100644
--- a/rdiff-backup/rdiff_backup/hash.py
+++ b/rdiff-backup/rdiff_backup/hash.py
@@ -62,7 +62,7 @@ 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
- digest = compute_sha1_fp(rp.open("r", compressed))
+ digest = compute_sha1_fp(rp.open("rb", compressed))
rp.set_sha1(digest)
return digest