Use md5 hashes for spool dir. Moved avatar dir to root of spool dir.

git-svn-id: http://delx.cjb.net/svn/pymsnt/trunk@196 55fbd22a-6204-0410-b2f0-b6c764c7e90a

committer: jamesbunton <jamesbunton@55fbd22a-6204-0410-b2f0-b6c764c7e90a>

diff --git a/src/housekeep.py b/src/housekeep.py
index 608c01e836bbb1d3230977ff612be8a831f89043..eff8ab644d17ea3ee5f1a929c1a9984c41bcf395 100644 (file)
--- a/src/housekeep.py
+++ b/src/housekeep.py
@@ -155,7 +155,7 @@ def doMD5HashDirUpgrade():
                                if not os.path.exists(pre + hash):
                                        os.makedirs(pre + hash)
                                shutil.move(pre2 + file, pre + hash + X + file)
-                       os.rmdir(dir)
+                       os.rmdir(pre)
        except Exception, e:
                print "Error in migration", pre, dir, hash, file, str(e)
                sys.exit(1)