[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/Main.py rdi...

[Andrew Ferguson]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Andrew Ferguson <owsla> 08/10/07 23:45:42

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : Main.py fs_abilities.py 

Log message:
        Don't backup Windows ACLs if the --no-acls option is specified.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.308&r2=1.309
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/Main.py?cvsroot=rdiff-backup&r1=1.119&r2=1.120
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.53&r2=1.54

Patches:
Index: CHANGELOG
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -b -r1.308 -r1.309
--- CHANGELOG   2 Oct 2008 03:46:01 -0000       1.308
+++ CHANGELOG   7 Oct 2008 23:45:41 -0000       1.309
@@ -1,6 +1,9 @@
 New in v1.2.2 (????/??/??)
 ---------------------------
 
+Don't backup Windows ACLs if the --no-acls option is specified. Thanks to
+Richard Metzger for reporting the issue. (Andrew Ferguson)
+
 Add error handling and logging to Windows ACL support; fixes Windows backup to
 SMB share. Improve test in fs_abilities to determine if Windows ACLs are
 supported. (Andrew Ferguson)

Index: rdiff_backup/Main.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/Main.py,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -b -r1.119 -r1.120
--- rdiff_backup/Main.py        20 Aug 2008 17:43:25 -0000      1.119
+++ rdiff_backup/Main.py        7 Oct 2008 23:45:41 -0000       1.120
@@ -157,7 +157,9 @@
                elif opt == "--max-file-size": select_opts.append((opt, arg))
                elif opt == "--min-file-size": select_opts.append((opt, arg))
                elif opt == "--never-drop-acls": Globals.set("never_drop_acls", 
1)
-               elif opt == "--no-acls": Globals.set("acls_active", 0)
+               elif opt == "--no-acls":
+                       Globals.set("acls_active", 0)
+                       Globals.set("win_acls_active", 0)
                elif opt == "--no-carbonfile": Globals.set("carbonfile_active", 
0)
                elif opt == "--no-compare-inode": Globals.set("compare_inode", 
0)
                elif opt == "--no-compression": Globals.set("compression", None)

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- rdiff_backup/fs_abilities.py        2 Oct 2008 03:46:02 -0000       1.53
+++ rdiff_backup/fs_abilities.py        7 Oct 2008 23:45:42 -0000       1.54
@@ -266,6 +266,12 @@
                """Set self.acls based on rp.  Does not write.  Needs to be 
local"""
                assert Globals.local_connection is rp.conn
                assert rp.lstat()
+               if Globals.acls_active == 0:
+                       log.Log("POSIX ACLs test skipped. rdiff-backup run "
+                                       "with --no-acls option.", 4)
+                       self.acls = 0
+                       return
+
                try: import posix1e
                except ImportError:
                        log.Log("Unable to import module posix1e from pylibacl "
@@ -379,6 +385,12 @@
                """Test if windows access control lists are supported"""
                assert Globals.local_connection is dir_rp.conn
                assert dir_rp.lstat()
+               if Globals.win_acls_active == 0:
+                       log.Log("Windows ACLs test skipped. rdiff-backup run "
+                                       "with --no-acls option.", 4)
+                       self.win_acls = 0
+                       return
+
                try:
                        import win32security, pywintypes
                except ImportError: