summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-12-29 16:10:15 +0000
committerowsla <owsla@2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109>2006-12-29 16:10:15 +0000
commit11ac04d5be78aacfd394b4822095f4aeebe18d31 (patch)
tree27f1a6070df5d3754999fef9f557ce8dd98f17da
parent8eb79a57c18395864e6ef3c776a40d57d9743332 (diff)
downloadrdiff-backup-11ac04d5be78aacfd394b4822095f4aeebe18d31.tar.gz
Add global to avoid unnecessary system calls on systems where umask does not affect symlinks
git-svn-id: http://svn.savannah.nongnu.org/svn/rdiff-backup/trunk@775 2b77aa54-bcbc-44c9-a7ec-4f6cf2b41109
-rw-r--r--rdiff-backup/rdiff_backup/Globals.py5
-rw-r--r--rdiff-backup/rdiff_backup/fs_abilities.py24
-rw-r--r--rdiff-backup/rdiff_backup/rpath.py4
3 files changed, 31 insertions, 2 deletions
diff --git a/rdiff-backup/rdiff_backup/Globals.py b/rdiff-backup/rdiff_backup/Globals.py
index 952208c..c130143 100644
--- a/rdiff-backup/rdiff_backup/Globals.py
+++ b/rdiff-backup/rdiff_backup/Globals.py
@@ -221,6 +221,11 @@ never_drop_acls = None
# prevent highbit permissions on systems which don't support them.)
permission_mask = 07777
+# If true, symlinks permissions are affected by the process umask, and
+# we should change the umask when creating them in order to preserve
+# the original permissions
+symlink_perms = None
+
def get(name):
"""Return the value of something in this module"""
return globals()[name]
diff --git a/rdiff-backup/rdiff_backup/fs_abilities.py b/rdiff-backup/rdiff_backup/fs_abilities.py
index 3387e92..9e17371 100644
--- a/rdiff-backup/rdiff_backup/fs_abilities.py
+++ b/rdiff-backup/rdiff_backup/fs_abilities.py
@@ -46,6 +46,7 @@ class FSAbilities:
name = None # Short string, not used for any technical purpose
read_only = None # True if capabilities were determined non-destructively
high_perms = None # True if suid etc perms are (read/write) supported
+ symlink_perms = None # True if symlink perms are affected by umask
def __init__(self, name = None):
"""FSAbilities initializer. name is only used in logging"""
@@ -87,6 +88,7 @@ class FSAbilities:
('Directory inc permissions',
self.dir_inc_perms),
('High-bit permissions', self.high_perms),
+ ('Symlink permissions', self.symlink_perms),
('Extended filenames', self.extended_filenames)])
add_boolean_list([('Access control lists', self.acls),
('Extended attributes', self.eas),
@@ -145,6 +147,7 @@ class FSAbilities:
self.set_resource_fork_readwrite(subdir)
self.set_carbonfile()
self.set_high_perms_readwrite(subdir)
+ self.set_symlink_perms(subdir)
subdir.delete()
return self
@@ -395,6 +398,21 @@ class FSAbilities:
else: self.high_perms = 1
tmp_rp.delete()
+ def set_symlink_perms(self, dir_rp):
+ """Test if symlink permissions are affected by umask"""
+ sym_source = dir_rp.append("symlinked_file1")
+ sym_source.touch()
+ sym_dest = dir_rp.append("symlinked_file2")
+ sym_dest.symlink(sym_source.path)
+ 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()
+
def get_readonly_fsa(desc_string, rp):
"""Return an fsa with given description_string
@@ -455,6 +473,9 @@ class SetGlobals:
if not self.dest_fsa.high_perms:
SetConnections.UpdateGlobal('permission_mask', 0777)
+ def set_symlink_perms(self):
+ SetConnections.UpdateGlobal('symlink_perms',
+ self.dest_fsa.symlink_perms)
class BackupSetGlobals(SetGlobals):
"""Functions for setting fsa related globals for backup session"""
@@ -612,6 +633,7 @@ def backup_set_globals(rpin):
bsg.set_fsync_directories()
bsg.set_change_ownership()
bsg.set_high_perms()
+ bsg.set_symlink_perms()
bsg.set_chars_to_quote(Globals.rbdir)
def restore_set_globals(rpout):
@@ -632,6 +654,7 @@ def restore_set_globals(rpout):
# No need to fsync anything when restoring
rsg.set_change_ownership()
rsg.set_high_perms()
+ rsg.set_symlink_perms()
rsg.set_chars_to_quote(Globals.rbdir)
def single_set_globals(rp, read_only = None):
@@ -650,5 +673,6 @@ def single_set_globals(rp, read_only = None):
ssg.set_hardlinks()
ssg.set_change_ownership()
ssg.set_high_perms()
+ ssg.set_symlink_perms()
ssg.set_chars_to_quote(Globals.rbdir)
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py
index 36cc8af..18b1184 100644
--- a/rdiff-backup/rdiff_backup/rpath.py
+++ b/rdiff-backup/rdiff_backup/rpath.py
@@ -103,9 +103,9 @@ def copy(rpin, rpout, compress = 0):
elif rpin.issym():
# some systems support permissions for symlinks, but
# only by setting at creation via the umask
- orig_umask = os.umask(0777 & ~rpin.getperms())
+ if Globals.symlink_perms: orig_umask = os.umask(0777 & ~rpin.getperms())
rpout.symlink(rpin.readlink())
- os.umask(orig_umask) # restore previous umask
+ if Globals.symlink_perms: os.umask(orig_umask) # restore previous umask
elif rpin.ischardev():
major, minor = rpin.getdevnums()
rpout.makedev("c", major, minor)