[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rpath.py rd..
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rpath.py rd... |
Date: |
Sun, 08 Mar 2009 17:20:18 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Changes by: Andrew Ferguson <owsla> 09/03/08 17:20:18
Modified files:
. : CHANGELOG
rdiff_backup : rpath.py fs_abilities.py
Log message:
Make sticky bit warnings quieter during fs_abilities checks
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.364&r2=1.365
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&r1=1.137&r2=1.138
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.70&r2=1.71
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -b -r1.364 -r1.365
--- CHANGELOG 8 Mar 2009 17:08:14 -0000 1.364
+++ CHANGELOG 8 Mar 2009 17:20:15 -0000 1.365
@@ -1,6 +1,9 @@
New in v1.3.3 (????/??/??)
---------------------------
+Make sticky bit warnings quieter while determining file system abilities.
+Closes Savannah bug #25788. (Andrew Ferguson)
+
Fix situation where destination file cannot be opened because of an access
error. Thanks to Dean Cording for the bug report. (Andrew Ferguson)
Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -b -r1.137 -r1.138
--- rdiff_backup/rpath.py 3 Jan 2009 21:41:53 -0000 1.137
+++ rdiff_backup/rpath.py 8 Mar 2009 17:20:16 -0000 1.138
@@ -921,7 +921,7 @@
"\nName: %s\nOld: %s --> New: %s\n" % \
(self.path, temptype, self.data['type'])
- def chmod(self, permissions):
+ def chmod(self, permissions, loglevel = 2):
"""Wrapper around os.chmod"""
try:
self.conn.os.chmod(self.path, permissions &
Globals.permission_mask)
@@ -932,7 +932,7 @@
# on a non-directory. Remove sticky bit and try
again.
log.Log("Warning: Unable to set permissions of
%s to %o - "
"trying again without sticky
bit (%o)" % (self.path,
- permissions, permissions &
06777), 2)
+ permissions, permissions &
06777), loglevel)
self.conn.os.chmod(self.path, permissions
& 06777 & Globals.permission_mask)
else:
Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- rdiff_backup/fs_abilities.py 2 Mar 2009 17:26:31 -0000 1.70
+++ rdiff_backup/fs_abilities.py 8 Mar 2009 17:20:17 -0000 1.71
@@ -451,15 +451,17 @@
"""See if increments can have full permissions like a
directory"""
test_rp = rp.append('dir_inc_check')
test_rp.touch()
- try: test_rp.chmod(07777)
+ try: test_rp.chmod(07777, 4)
except OSError:
test_rp.delete()
self.dir_inc_perms = 0
return
test_rp.setdata()
assert test_rp.isreg()
- if test_rp.getperms() == 07777: self.dir_inc_perms = 1
- else: self.dir_inc_perms = 0
+ if test_rp.getperms() == 07777 or test_rp.getperms() == 06777:
+ self.dir_inc_perms = 1
+ else:
+ self.dir_inc_perms = 0
test_rp.delete()
def set_carbonfile(self):
@@ -527,10 +529,10 @@
tmpd_rp = dir_rp.append("high_perms_dir")
tmpd_rp.touch()
try:
- tmpf_rp.chmod(07000)
- tmpf_rp.chmod(07777)
- tmpd_rp.chmod(07000)
- tmpd_rp.chmod(07777)
+ tmpf_rp.chmod(07000, 4)
+ tmpf_rp.chmod(07777, 4)
+ tmpd_rp.chmod(07000, 4)
+ tmpd_rp.chmod(07777, 4)
except (OSError, IOError): self.high_perms = 0
else: self.high_perms = 1
tmpf_rp.delete()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/rpath.py rd...,
Andrew Ferguson <=