feature #863: bug fixes and cosmetic changes

This commit is contained in:
Javi Fontan committed 2011-11-24 18:32:25 +01:00
1 parent 82a78bb9a6
commit c04e4da220
3 files changed
+11 -6

No files matched your search

+7 -3
View File
@@ -86,10 +86,14 @@ class SshStream
code = -1
while not (done_out and done_err)
rc, rw, = IO.select([@stdout, @stderr],[],[])
rc, rw, re= IO.select([@stdout, @stderr],[],[])
rc.each { |fd|
c = fd.read_nonblock(80)
begin
c = fd.read_nonblock(50)
rescue EOFError => e
next
end
if !c
done = true
@@ -153,7 +157,7 @@ class SshStreamCommand < GenericCommand
log(@stderr)
return @code
return self
end
end
+1
View File
@@ -33,6 +33,7 @@ $: << RUBY_LIB_LOCATION
require "VirtualMachineDriver"
require 'one_vnm'
require 'getoptlong'
require 'ssh_stream'
require 'pp'
+3 -3
View File
@@ -34,7 +34,7 @@ class VirtualNetworkDriver
@vm_encoded = Base64.encode64(@message.elements['VM'].to_s).delete("\n")
initialize_helper("vnet/#{directory}", options)
initialize_helper("vnm/#{directory}", options)
end
# Calls remotes or local action checking the action name and
@@ -61,9 +61,9 @@ class VirtualNetworkDriver
stdin = nil
end
execution = @ssh_stream.run(command,stdin)
execution = @ssh_stream.run(command, stdin)
end
result, info = get_info_from_execution(execution)
end
end
end