summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-12-18 00:44:24 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2008-12-18 00:44:24 +0000
commit74f0b728d89b3db84f9c410adb8c2a666fd19ef0 (patch)
treef02cbc3a98b3fd3e176e488e47b4600a09c01241
parent570e19ba9e514b44be7d0aaf5f5caaed2fad4e82 (diff)
downloadrdiff-backup-74f0b728d89b3db84f9c410adb8c2a666fd19ef0.tar.gz
Test for symlink permissions now produces a functioning symlink.
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@968 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/CHANGELOG3
-rw-r--r--rdiff-backup/rdiff_backup/fs_abilities.py4
2 files changed, 4 insertions, 3 deletions
diff --git a/rdiff-backup/CHANGELOG b/rdiff-backup/CHANGELOG
index e600968..7698fcd 100644
--- a/rdiff-backup/CHANGELOG
+++ b/rdiff-backup/CHANGELOG
@@ -1,6 +1,9 @@
New in v1.2.3 (????/??/??)
---------------------------
+Test for symlink permissions now produces a functioning symlink. Thanks to
+Julien Poffet for reporting the issue. (Andrew Ferguson)
+
Fix for crash when deleting read-only files on Windows. (Patch from Josh Nisly)
Fix for Python 2.2 in win_acls.py (Closes Savannah bug #24922).
diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py
index 3be42d1..902242b 100644
--- a/rdiff-backup/rdiff_backup/fs_abilities.py
+++ b/rdiff-backup/rdiff_backup/fs_abilities.py
@@ -542,16 +542,14 @@ class FSAbilities:
sym_source.touch()
sym_dest = dir_rp.append("symlinked_file2")
try:
- sym_dest.symlink(sym_source.path)
+ sym_dest.symlink("symlinked_file1")
except (OSError, AttributeError):
self.symlink_perms = 0
else:
sym_dest.setdata()
assert sym_dest.issym()
- orig_umask = os.umask(077)
if sym_dest.getperms() == 0700: self.symlink_perms = 1
else: self.symlink_perms = 0
- os.umask(orig_umask)
sym_dest.delete()
sym_source.delete()