Merge lp:~javier.collado/utah/bug1163197 into lp:utah

[Javier Collado]

This branch checks sftp_client value to make sure it's been correctly assigned
before trying to close it in the finally clause.

[Andy Doan (doanac)]

review: Approve

[Max Brustkern (nuclearbob)]

Looks good to me.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-04-03 09:45:19 +0000
+++ debian/changelog	2013-04-03 14:53:21 +0000
@@ -5,6 +5,7 @@
   * Stop server on installation failure (LP: #1161855)
   * Check group after command line argument parsing (LP: #1126219)
   * Added INVALID_USER return code (LP: #1160032)
+  * Try to close SFTP client only if it's open (LP: #1163197)
 
  -- Javier Collado <[e-mail]>  Wed, 27 Mar 2013 13:00:47 +0100
 

=== modified file 'utah/provisioning/ssh.py'
--- utah/provisioning/ssh.py	2013-03-15 14:59:35 +0000
+++ utah/provisioning/ssh.py	2013-04-03 14:53:21 +0000
@@ -22,7 +22,6 @@
 import os
 import paramiko
 import socket
-import time
 
 from stat import S_ISDIR
 
@@ -160,6 +159,7 @@
 
         self.activecheck()
         failed = []
+        sftp_client = None
         try:
             self.ssh_client.connect(self.name,
                                     username=config.user,
@@ -184,7 +184,8 @@
                 socket.error) as err:
             raise UTAHProvisioningException(err)
         finally:
-            sftp_client.close()
+            if sftp_client:
+                sftp_client.close()
             if len(failed) > 0:
                 err = UTAHProvisioningException('Files do not exist: '
                                                 + ' '.join(failed))