gump-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject svn commit: r159422 - gump/trunk/python/gump/util/sync.py
Date Tue, 29 Mar 2005 20:30:16 GMT
Author: ajack
Date: Tue Mar 29 12:30:15 2005
New Revision: 159422

URL: http://svn.apache.org/viewcvs?view=rev&rev=159422
Log:
More hacking about...

Modified:
    gump/trunk/python/gump/util/sync.py

Modified: gump/trunk/python/gump/util/sync.py
URL: http://svn.apache.org/viewcvs/gump/trunk/python/gump/util/sync.py?view=diff&r1=159421&r2=159422
==============================================================================
--- gump/trunk/python/gump/util/sync.py (original)
+++ gump/trunk/python/gump/util/sync.py Tue Mar 29 12:30:15 2005
@@ -177,9 +177,13 @@
         #
         #
         for name in names:
+            
+            # :TODO: Hack for Latin_1
+            name = getStringFromUnicode(name)
+            
             try:    
-                srcname = os.path.join(src, getStringFromUnicode(name))
-                dstname = os.path.join(dst, getStringFromUnicode(name))
+                srcname = os.path.join(src, name)
+                dstname = os.path.join(dst, name)
             
             except UnicodeDecodeError, why:
                 message = 'Unicode Error. Can\'t copy [%s] in [%s] to [%s]: [%s]' % (`name`,
`src`, `dst`, str(why))
@@ -217,6 +221,10 @@
         None
         """
         for afile in existingfiles:
+            
+            # :TODO: Hack for LATIN_1
+            afile = getStringFromUnicode(afile)
+            
             fullsourcefile = os.path.join(sourcedir, afile)
             fulldestfile = os.path.join(destdir, afile)
             if not afile in acceptablefiles:
@@ -250,6 +258,9 @@
         removed = []
         for afile in existingfiles:
             
+            # :TODO: Hack for latin_1
+            afile = getStringFromUnicode(afile)
+            
             if afile in acceptablefiles:
                                 
                 fullsourcefile = os.path.join(sourcedir, afile)
@@ -272,6 +283,9 @@
                     
         # Do the work
         for afile in removed:
+            # :TODO: Hack for latin_1
+            afile = getStringFromUnicode(afile)
+           
             existingfiles.remove(afile)             
                 
     def maybecopy(self, srcname, dstname):



Mime
View raw message