lib/cloud_providers/connections.rb in auser-poolparty-1.3.16 vs lib/cloud_providers/connections.rb in auser-poolparty-1.3.17

@@ -40,14 +40,14 @@
     # Default options are -o StrictHostKeyChecking=no -i keypair.full_filepath -l user
     # {'-i'=>'keyfile, '-l' => 'fred' } would become
     # "-i keyfile -o StrictHostKeyChecking=no -i keypair.to_s -l fred"
     def ssh_options(opts={})
       return @ssh_options if @ssh_options && opts.empty?
-      ssh_options = {"-i" => keypair.full_filepath,
+      ssh_opts = {"-i" => keypair.full_filepath,
            "-o" =>"StrictHostKeyChecking=no"
            }.merge(opts)
-      @ssh_options = ssh_options.collect{ |k,v| "#{k} #{v}"}.join(' ')
+      @ssh_options = ssh_opts.collect{ |k,v| "#{k} #{v}"}.join(' ')
     end
     
     def rsync( opts={} )
       raise StandardError.new("You must pass a :source=>uri option to rsync") unless opts[:source]
       destination_path = opts[:destination] || opts[:source]
@@ -86,12 +86,15 @@
             end
           end
           err = stderr.readlines
           $stderr.write_nonblock(err)
         rescue SystemCallError => error
-          $stderr.write_nonblock(stderr)
+          err = stderr.readlines
+          $stderr.write_nonblock(err)
         rescue EOFError => error
-           # nothing
+          err = stderr.readlines
+          $stderr.write_nonblock(err)
+          # used to do nothing
         end
       end
       buf
     end
     
\ No newline at end of file