summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-09-25 16:42:25 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-09-25 16:42:25 +0000
commit4b511ebaafe5ce126fcfef2e58cd1932f8149f66 (patch)
tree4a6a959a30e647f160e7e0f691d955433639acf2
parent7edbfd9ff7f0a8f667e5c4bfd590911d286b7d46 (diff)
downloadrdiff-backup-4b511ebaafe5ce126fcfef2e58cd1932f8149f66.tar.gz
Properly fix no 'inc_compressed' attribute bug.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@937 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/metadata.py3
2 files changed, 4 insertions, 2 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 74d75a7..ba283ce 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.2.2 (????/??/??)
---------------------------
+Properly fix "AttributeError: RPath instance has no attribute 'inc_compressed'"
+bug. Fix in 1.1.12 was in correct place, but wrong solution. (Andrew Ferguson)
+
Improve support for Python 2.5, which refactored the built-in exceptions so
that SystemExit and KeyboardInterrupt no longer derive from Exception.
Closes support request #106504. (Andrew Ferguson)
diff --git a/rdiff-backup/rdiff_backup/metadata.py b/rdiff-backup/rdiff_backup/metadata.py
index 1bbc5c6..2870955 100644
--- a/rdiff-backup/rdiff_backup/metadata.py
+++ b/rdiff-backup/rdiff_backup/metadata.py
@@ -379,8 +379,7 @@ class FlatFile:
self.fileobj = self.rp.open("rb", compress)
else:
assert mode == 'w'
- if not check_path: rp_base.isincfile()
- if compress and not rp_base.isinccompressed():
+ if compress and check_path and not rp_base.isinccompressed()):
def callback(rp): self.rp = rp
self.fileobj = rpath.MaybeGzip(rp_base, callback)
else: