summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-08 17:21:59 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2009-03-08 17:21:59 +0000
commit0cde1cd04266e72449e62df2c895653179cc7caf (patch)
tree317c7b5ba910f6265bc90a2d440f246093e344bb
parentc4ba05b9f99e34bca4c5c8faaed89c1c8b4d0ed2 (diff)
downloadrdiff-backup-0cde1cd04266e72449e62df2c895653179cc7caf.tar.gz
Handle EACCES as well as EPERM
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/branches/r1-2@1038 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/backup.py2
2 files changed, 4 insertions, 1 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index 92ec3ba..ae6f475 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.2.8 (????/??/??)
---------------------------
+Fix situation where destination file cannot be opened because of an access
+error. Thanks to Dean Cording for the bug report. (Andrew Ferguson)
+
Fix --compare-hash options on Windows. Thanks to Serge Zub for the fix.
diff --git a/rdiff-backup/rdiff_backup/backup.py b/rdiff-backup/rdiff_backup/backup.py
index e152d8f..5dbd0a7 100644
--- a/rdiff-backup/rdiff_backup/backup.py
+++ b/rdiff-backup/rdiff_backup/backup.py
@@ -211,7 +211,7 @@ class DestinationStruct:
try:
return Rdiff.get_signature(dest_rp)
except IOError, e:
- if (e.errno == errno.EPERM):
+ if (e.errno == errno.EPERM or e.errno == errno.EACCES):
try:
# Try chmod'ing anyway -- This can work on NFS and AFS
# depending on the setup. We keep the if() statement