[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie..
From: |
Andrew Ferguson |
Subject: |
[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie... [r1-2] |
Date: |
Sun, 08 Mar 2009 17:25:01 +0000 |
CVSROOT: /sources/rdiff-backup
Module name: rdiff-backup
Branch: r1-2
Changes by: Andrew Ferguson <owsla> 09/03/08 17:25:01
Modified files:
. : CHANGELOG
rdiff_backup : fs_abilities.py rpath.py
Log message:
Make sticky bit warnings quieter during fs_abilities
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.338.2.13&r2=1.338.2.14
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.61.2.2&r2=1.61.2.3
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/rpath.py?cvsroot=rdiff-backup&only_with_tag=r1-2&r1=1.136&r2=1.136.2.1
Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.338.2.13
retrieving revision 1.338.2.14
diff -u -b -r1.338.2.13 -r1.338.2.14
--- CHANGELOG 8 Mar 2009 17:21:58 -0000 1.338.2.13
+++ CHANGELOG 8 Mar 2009 17:25:00 -0000 1.338.2.14
@@ -1,6 +1,9 @@
New in v1.2.8 (????/??/??)
---------------------------
+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/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.61.2.2
retrieving revision 1.61.2.3
diff -u -b -r1.61.2.2 -r1.61.2.3
--- rdiff_backup/fs_abilities.py 2 Mar 2009 17:25:54 -0000 1.61.2.2
+++ rdiff_backup/fs_abilities.py 8 Mar 2009 17:25:00 -0000 1.61.2.3
@@ -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()
Index: rdiff_backup/rpath.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/rpath.py,v
retrieving revision 1.136
retrieving revision 1.136.2.1
diff -u -b -r1.136 -r1.136.2.1
--- rdiff_backup/rpath.py 22 Dec 2008 16:57:41 -0000 1.136
+++ rdiff_backup/rpath.py 8 Mar 2009 17:25:01 -0000 1.136.2.1
@@ -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: