[cedar-backup-svn] SF.net SVN: cedar-backup:[928] cedar-backup2/trunk

[<pro...@us...>]

Revision: 928
          http://cedar-backup.svn.sourceforge.net/cedar-backup/?rev=928&view=rev
Author:   pronovic
Date:     2008-11-15 18:12:43 +0000 (Sat, 15 Nov 2008)

Log Message:
-----------
Fix bug when logging strange filenames.

Modified Paths:
--------------
    cedar-backup2/trunk/CedarBackup2/filesystem.py
    cedar-backup2/trunk/Changelog

Modified: cedar-backup2/trunk/CedarBackup2/filesystem.py
===================================================================
--- cedar-backup2/trunk/CedarBackup2/filesystem.py	2008-10-06 02:39:43 UTC (rev 927)
+++ cedar-backup2/trunk/CedarBackup2/filesystem.py	2008-11-15 18:12:43 UTC (rev 928)
@@ -304,10 +304,12 @@
          logger.debug("Path [%s] is excluded based on excludePaths." % path)
          return 0
       for pattern in self.excludePatterns:
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(path): # safe to assume all are valid due to RegexList
             logger.debug("Path [%s] is excluded based on pattern [%s]." % (path, pattern))
             return 0
       for pattern in self.excludeBasenamePatterns: # safe to assume all are valid due to RegexList
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(os.path.basename(path)):
             logger.debug("Path [%s] is excluded based on basename pattern [%s]." % (path, pattern))
             return 0
@@ -347,10 +349,12 @@
          logger.debug("Path [%s] is excluded based on excludePaths." % path)
          return 0
       for pattern in self.excludePatterns: # safe to assume all are valid due to RegexList
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(path):
             logger.debug("Path [%s] is excluded based on pattern [%s]." % (path, pattern))
             return 0
       for pattern in self.excludeBasenamePatterns: # safe to assume all are valid due to RegexList
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(os.path.basename(path)):
             logger.debug("Path [%s] is excluded based on basename pattern [%s]." % (path, pattern))
             return 0
@@ -460,10 +464,12 @@
          logger.debug("Path [%s] is excluded based on excludePaths." % path)
          return added
       for pattern in self.excludePatterns: # safe to assume all are valid due to RegexList
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(path):
             logger.debug("Path [%s] is excluded based on pattern [%s]." % (path, pattern))
             return added
       for pattern in self.excludeBasenamePatterns: # safe to assume all are valid due to RegexList
+         pattern = encodePath(pattern)  # use same encoding as filenames
          if re.compile(r"^%s$" % pattern).match(os.path.basename(path)):
             logger.debug("Path [%s] is excluded based on basename pattern [%s]." % (path, pattern))
             return added
@@ -537,6 +543,7 @@
                removed += 1
       else:
          try:
+            pattern = encodePath(pattern)  # use same encoding as filenames
             compiled = re.compile(pattern)
          except re.error:
             raise ValueError("Pattern is not a valid regular expression.")
@@ -579,6 +586,7 @@
                removed += 1
       else:
          try:
+            pattern = encodePath(pattern)  # use same encoding as filenames
             compiled = re.compile(pattern)
          except re.error:
             raise ValueError("Pattern is not a valid regular expression.")
@@ -619,6 +627,7 @@
                removed += 1
       else:
          try:
+            pattern = encodePath(pattern)  # use same encoding as filenames
             compiled = re.compile(pattern)
          except re.error:
             raise ValueError("Pattern is not a valid regular expression.")
@@ -653,6 +662,7 @@
       @raise ValueError: If the passed-in pattern is not a valid regular expression.
       """
       try:
+         pattern = encodePath(pattern)  # use same encoding as filenames
          compiled = re.compile(pattern)
       except re.error:
          raise ValueError("Pattern is not a valid regular expression.")

Modified: cedar-backup2/trunk/Changelog
===================================================================
--- cedar-backup2/trunk/Changelog	2008-10-06 02:39:43 UTC (rev 927)
+++ cedar-backup2/trunk/Changelog	2008-11-15 18:12:43 UTC (rev 928)
@@ -1,3 +1,7 @@
+Version 2.19.1    unreleased
+
+	* Fix bug when logging strange filenames.
+
 Version 2.19.0		05 Oct 2008
 
 	* Fix a few typos in the CREDITS file.


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.