diff options
Diffstat (limited to 'rdiff-backup/rdiff_backup/rpath.py')
| -rw-r--r-- | rdiff-backup/rdiff_backup/rpath.py | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/rdiff-backup/rdiff_backup/rpath.py b/rdiff-backup/rdiff_backup/rpath.py index a28efaa..b6b7578 100644 --- a/rdiff-backup/rdiff_backup/rpath.py +++ b/rdiff-backup/rdiff_backup/rpath.py @@ -829,7 +829,19 @@ class RPath(RORPath): def chmod(self, permissions): """Wrapper around os.chmod""" - self.conn.os.chmod(self.path, permissions & Globals.permission_mask) + try: + self.conn.os.chmod(self.path, permissions & Globals.permission_mask) + except OSError, exc: + if exc[0] == errno.EFTYPE and not self.isdir(): + # Some systems throw this error if try to set sticky bit + # on a non-directory. Remove sticky bit and try again. + log.Log("Unable to set permissions of %s to %o - trying again" + "without sticky bit (%o)" % (self.path, permissions, + permissions & 06777), 2) + self.conn.os.chmod(self.path, permissions + & 06777 & Globals.permission_mask) + else: + raise self.data['perms'] = permissions def settime(self, accesstime, modtime): |