Fixed messy merge.

Author: Kincaid Savoie

pssh/ssh_client.py

@@ -311,16 +311,19 @@ def copy_file(self, local_file, remote_file, recurse=False):
             return self._copy_dir(local_file, remote_file)
         sftp = self._make_sftp()
         destination = [_dir for _dir in remote_file.split(os.path.sep)
-                       if _dir][:-1]
+                       if _dir][:-1][0]
         if remote_file.startswith(os.path.sep):
-            destination[0] = os.path.sep + destination[0]
-        # import ipdb; ipdb.set_trace()
+            destination = os.path.sep + destination
         try:
-            sftp.stat(destination[0])
+            sftp.stat(destination)
         except IOError:
-            self.mkdir(sftp, destination[0])
+            self.mkdir(sftp, destination)
+        sftp.chdir()
         try:
             sftp.put(local_file, remote_file)
         except Exception, error:
             logger.error("Error occured copying file %s to remote destination %s:%s - %s",
                          local_file, self.host, remote_file, error)
+        else:
+            logger.info("Copied local file %s to remote destination %s:%s",
+                        local_file, self.host, remote_file)