[Rdiff-backup-commits] rdiff-backup CHANGELOG rdiff_backup/fs_abilitie...

[dean gaudet]

CVSROOT:        /cvsroot/rdiff-backup
Module name:    rdiff-backup
Changes by:     dean gaudet <dgaudet>   07/05/19 18:38:45

Modified files:
        .              : CHANGELOG 
        rdiff_backup   : fs_abilities.py 

Log message:
        Fix for bug #19895 -- eliminate traceback for special file detection
        on CIFS mounts.  (Jonathan Hankins)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/CHANGELOG?cvsroot=rdiff-backup&r1=1.210&r2=1.211
http://cvs.savannah.gnu.org/viewcvs/rdiff-backup/rdiff_backup/fs_abilities.py?cvsroot=rdiff-backup&r1=1.33&r2=1.34

Patches:
Index: CHANGELOG
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/CHANGELOG,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -b -r1.210 -r1.211
--- CHANGELOG   13 May 2007 05:47:02 -0000      1.210
+++ CHANGELOG   19 May 2007 18:38:45 -0000      1.211
@@ -1,6 +1,10 @@
 New in v1.1.11 (????/??/??)
 ---------------------------
 
+Fix for bug #19895 -- eliminate traceback for special file detection
+on CIFS mounts.  (Jonathan Hankins)
+
+
 New in v1.1.10 (2007/05/12)
 ---------------------------
 

Index: rdiff_backup/fs_abilities.py
===================================================================
RCS file: /cvsroot/rdiff-backup/rdiff-backup/rdiff_backup/fs_abilities.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- rdiff_backup/fs_abilities.py        31 Jan 2007 16:12:02 -0000      1.33
+++ rdiff_backup/fs_abilities.py        19 May 2007 18:38:45 -0000      1.34
@@ -420,17 +420,20 @@
 
        def set_escape_dos_devices(self, subdir):
                """If special file aux can be stat'd, escape special files"""
+               try:
                device_rp = subdir.append("aux")
                if device_rp.lstat():
-                       assert device_rp.lstat()
                        log.Log("escape_dos_devices required by filesystem at 
%s" \
                                        % (subdir.path), 4)
                        self.escape_dos_devices = 1
                else:
-                       assert not device_rp.lstat()
                        log.Log("escape_dos_devices not required by filesystem 
at %s" \
                                        % (subdir.path), 4)
                        self.escape_dos_devices = 0
+               except(OSError):
+                       log.Log("escape_dos_devices required by filesystem at 
%s" \
+                                       % (subdir.path), 4)
+                       self.escape_dos_devices = 1
 
 def get_readonly_fsa(desc_string, rp):
        """Return an fsa with given description_string
@@ -515,9 +518,11 @@
 
        def set_must_escape_dos_devices(self, rbdir):
                """If local edd or src edd, then must escape """
+               try:
                device_rp = rbdir.append("aux")
                if device_rp.lstat(): local_edd = 1
                else: local_edd = 0
+               except (OSError): local_edd = 1
                SetConnections.UpdateGlobal('must_escape_dos_devices', \
                        self.src_fsa.escape_dos_devices or local_edd)
                log.Log("Backup: must_escape_dos_devices = %d" % \
@@ -606,9 +611,11 @@
                if getattr(self, "src_fsa", None) is not None:
                        src_edd = self.src_fsa.escape_dos_devices
                else: src_edd = 0
+               try:
                device_rp = rbdir.append("aux")
                if device_rp.lstat(): local_edd = 1
                else: local_edd = 0
+               except (OSError): local_edd = 1
                SetConnections.UpdateGlobal('must_escape_dos_devices', \
                        src_edd or local_edd)
                log.Log("Restore: must_escape_dos_devices = %d" % \