thomas: utils/admin convert-gdbm-dbload,1.2,1.3

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/utils/admin
In directory doto:/tmp/cvs-serv1563

Modified Files:
	convert-gdbm-dbload 
Log Message:
convert-gdbm-dbload: copy newstyle folders, don't remove from list during loop


Index: convert-gdbm-dbload
===================================================================
RCS file: /kolabrepository/utils/admin/convert-gdbm-dbload,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- convert-gdbm-dbload	9 May 2007 18:05:56 -0000	1.2
+++ convert-gdbm-dbload	10 May 2007 12:45:13 -0000	1.3
@@ -67,7 +67,6 @@
 
 
 def copy_folder(source, target):
-    target = quote_folder(target)
     targetdir = os.path.dirname(target)
     if not os.path.isdir(targetdir):
         os.makedirs(targetdir)
@@ -102,23 +101,29 @@
     while k != None:
         folders = db[k].split(',')
         folders.pop(0)
+        newfolders=['']
 
         for folder in folders:
             newfolder = translate_foldername(folder)
             if newfolder:
                 if newfolder in folders:
-                    folders.remove(folder)
-                    sys.stdout.write("not overwriting %s (already exists\n"
+                    sys.stdout.write("not overwriting %s (already exists)\n"
                                      % newfolder)
                 else:
                     sys.stdout.write("copying folder %s\n" % folder)
+                    newfolders.append(newfolder)
                     copy_folder(os.path.join(old, folder),
-                                os.path.join(new, newfolder))
+                                os.path.join(new, quote_folder(newfolder)))
+            else:
+                sys.stdout.write("copying folder %s (already converted)\n"
+                                 % folder)
+                copy_folder(os.path.join(old, quote_folder(folder)),
+                            os.path.join(new, quote_folder(folder)))
+                newfolders.append(folder)
 
-        folders.insert(0, '')
         db_load.write(" %s\n %s\n"
                       % (binascii.hexlify(k),
-                         binascii.hexlify(','.join(folders))))
+                         binascii.hexlify(','.join(newfolders))))
         k = db.nextkey(k)
     db.close()