[Rdiff-backup-commits] rdiff-backup/rdiff_backup win_acls.py

[Josh Nisly]

CVSROOT:        /sources/rdiff-backup
Module name:    rdiff-backup
Changes by:     Josh Nisly <joshn>      09/10/01 01:09:09

Modified files:
        rdiff_backup   : win_acls.py 

Log message:
        Fix exception in win_acls.py when backing up Windows -> Linux.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/win_acls.py?cvsroot=rdiff-backup&r1=1.7&r2=1.8

Patches:
Index: win_acls.py
===================================================================
RCS file: /sources/rdiff-backup/rdiff-backup/rdiff_backup/win_acls.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- win_acls.py 16 May 2009 03:08:40 -0000      1.7
+++ win_acls.py 1 Oct 2009 01:09:09 -0000       1.8
@@ -28,6 +28,8 @@
        OWNER_SECURITY_INFORMATION = 0
        DACL_SECURITY_INFORMATION = 0
 
+       pywintypes = None
+
 def encode(str_):
        if type(str_) == unicode:
                return str_.encode('utf-8')
@@ -46,6 +48,12 @@
 
        def load_from_rp(self, rp, skip_inherit_only = True):
                self.index = rp.index
+
+               # Sometimes, we are asked to load from an rpath when ACL's
+               # are not supported. Ignore the request in this case.
+               if not pywintypes:
+                       return
+
                try:
                        sd = rp.conn.win32security. \
                                        GetNamedSecurityInfo(rp.path, 
SE_FILE_OBJECT, ACL.flags)