Bugfix

pym/cl_client.py

@@ -2063,12 +2063,15 @@ you need to remove it from the previous domain"))
         previousHome = "/var/calculate/client-home"
         if os.path.exists(previousHome):
             for userName,x,uid,gid,gecos,directory,shell in loginUsersData:
-                srcDir = pathJoin(previousHome, directory)
                 homeDir = directory
+                pathUser ="/".join(filter(lambda x: x, directory.split('/'))[1:])
+		srcDir = pathJoin(previousHome, pathUser)
                 if os.path.exists(srcDir) and not os.path.exists(homeDir):
                     destDir = os.path.dirname(homeDir)
                     if not self.copyTemplateDir(srcDir, destDir):
                         return False
+	if not os.listdir(previousHome):
+            os.rmdir(previousHome)
         return True
 
     def mountRemote(self):