consolidate aborted error messages

git-svn-id: file:///home/svn/framework3/trunk@9723 4d416f70-5f16-0410-b530-b9f4589650da
unstable
Joshua Drake 2010-07-07 18:18:38 +00:00
parent c0aca105de
commit 5f2aa8bb0b
1 changed files with 6 additions and 4 deletions

View File

@ -112,17 +112,19 @@ begin
cmds.each { |cmd| cmds.each { |cmd|
ret = session.shell_command_token_win32(cmd) ret = session.shell_command_token_win32(cmd)
if (not ret) if (not ret)
print_error("Error: Unable to execute the following command:")
print_error(cmd.inspect)
aborted = true aborted = true
else else
ret.strip! ret.strip!
if (not ret.empty?) if (not ret.empty?)
print_error(ret)
aborted = true aborted = true
end end
end end
break if aborted if aborted
print_error("Error: Unable to execute the following command:")
print_error(cmd.inspect)
print_error('Output: ' + ret.inspect) if ret and not ret.empty?
break
end
sent += cmd.length sent += cmd.length