wilde: utils/admin hash-imap-spool,1.1,1.2

[cvs at kolab.org]

Author: wilde

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

Modified Files:
	hash-imap-spool 
Log Message:
Fixed special case of sub folders of shared folders.


Index: hash-imap-spool
===================================================================
RCS file: /kolabrepository/utils/admin/hash-imap-spool,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hash-imap-spool	12 Oct 2007 09:54:00 -0000	1.1
+++ hash-imap-spool	12 Oct 2007 12:47:12 -0000	1.2
@@ -62,24 +62,26 @@
     del tmp_hash_dirs[:]
 
 
-def hash_users(tmp_hash_dirs):
-    for user in os.listdir("."):
-        tmphash_dir(user, tmp_hash_dirs, "..", "user")
-        print ".",
+def hash_submb(name, tmp_hash_dirs):
+    for file in os.listdir("."):
+        if os.path.isdir(file):
+            tmphash_dir(file, tmp_hash_dirs, "..", name)
+            print ".",
 
 
 def hash_mailboxes():
     tmp_hash_dirs = []
     for dir in os.listdir("."):
-        if dir == "user":
+        if dir == "user" or dir[0:6] == "shared":
             old_cwd = os.getcwd()
-            os.chdir("user")
-            hash_users(tmp_hash_dirs)
+            os.chdir(dir)
+            hash_submb(dir, tmp_hash_dirs)
             os.chdir(old_cwd)
-            os.rmdir("user")
-        else:
-            tmphash_dir(dir, tmp_hash_dirs)
-            print ".",
+            if dir == "user": 
+                os.rmdir(dir)
+                continue
+        tmphash_dir(dir, tmp_hash_dirs)
+        print ".",
     cleanup_tmp_hash_dirs(tmp_hash_dirs)