summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/hash.py5
2 files changed, 8 insertions, 0 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 7698fcd..4bf5fd3 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.2.3 (????/??/??)
---------------------------
+Supress warnings about the deprecated sha module in Python 2.6. We'll remove
+this after rdiff-backup is ported to Python 3. (Patch from Josh Nisly)
+
Test for symlink permissions now produces a functioning symlink. Thanks to
Julien Poffet for reporting the issue. (Andrew Ferguson)
diff --git a/rdiff-backup/rdiff_backup/hash.py b/rdiff-backup/rdiff_backup/hash.py
index 0279f70..317ad96 100644
--- a/rdiff-backup/rdiff_backup/hash.py
+++ b/rdiff-backup/rdiff_backup/hash.py
@@ -19,6 +19,11 @@
"""Contains a file wrapper that returns a hash on close"""
+# Until rdiff-backup is ported to Python 3 (or abandons support for versions
+# below Python 2.5), we'll ignore the warning about the deprecated sha module
+import warnings
+warnings.simplefilter('ignore')
+
import sha
import Globals