From 74f0b728d89b3db84f9c410adb8c2a666fd19ef0 Mon Sep 17 00:00:00 2001 From: owsla Date: Thu, 18 Dec 2008 00:44:24 +0000 Subject: 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 --- rdiff-backup/CHANGELOG | 3 +++ rdiff-backup/rdiff_backup/fs_abilities.py | 4 +--- 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() -- cgit v1.2.1