X-Git-Url: https://code.delx.au/pymsnt/blobdiff_plain/f16f4d068fdda45c7b1efce266434ffbf4926940..2968343a624f304d4bd1ef9abfa9be069294c6e8:/src/housekeep.py

diff --git a/src/housekeep.py b/src/housekeep.py
index eff8ab6..82a459b 100644
--- a/src/housekeep.py
+++ b/src/housekeep.py
@@ -133,8 +133,8 @@ def doMD5HashDirUpgrade():
 	if os.path.exists(pre + "avatars"):
 		# Remove the avatars dir that gets created when we import
 		# legacy/glue.py (it only contains the defaultAvatar)
-		shutil.rmtree(config.spooldir + X + "avatars")
-		shutil.move(pre + "avatars", config.spooldir + X + "avatars")
+		shutil.rmtree(os.path.join(config.spooldir, "avatars"))
+		shutil.move(pre + "avatars", os.path.join(config.spooldir, "avatars"))
 	else:
 		print "Could not move your cached avatars directory automatically. It is safe to delete it, the avatars will be recreated as necessary."
 
@@ -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(pre)
+			os.rmdir(pre2)
 	except Exception, e:
 		print "Error in migration", pre, dir, hash, file, str(e)
 		sys.exit(1)