From bdf958c57a5418c61f0855d98212f89975ff8c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Font=C3=A1n=20Mui=C3=B1os?= Date: Wed, 15 Apr 2009 13:58:47 +0000 Subject: [PATCH] Got rid of transfer script name log printing and cosmetic changes git-svn-id: http://svn.opennebula.org/one/trunk@470 3034c82b-c49b-4eb3-8279-a7acafdc01c0 --- src/tm_mad/TMScript.rb | 16 ++++++++-------- src/tm_mad/one_tm.rb | 2 -- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/tm_mad/TMScript.rb b/src/tm_mad/TMScript.rb index 0a1c6c73e8..6f272d23c6 100644 --- a/src/tm_mad/TMScript.rb +++ b/src/tm_mad/TMScript.rb @@ -71,9 +71,9 @@ class TMPlugin < Hash # arguments provided. cmd=[self[command], *args].join(" ") - local_command = LocalCommand.run(cmd, logger) + local_command = LocalCommand.run(cmd, logger) - logger.call(local_command.stdout) if logger + logger.call(local_command.stdout) if logger local_command end @@ -149,15 +149,15 @@ class TMScript res = [false, "COMMAND not found: #{line.join(" ")}."] else - if res.code == 0 - res = [true, ""] - else - res = [false, get_error_message(res.stderr)] - end + if res.code == 0 + res = [true, ""] + else + res = [false, get_error_message(res.stderr)] + end end # do not continue if command failed - break res if !res[0] + break res if !res[0] } result diff --git a/src/tm_mad/one_tm.rb b/src/tm_mad/one_tm.rb index 226b3ed6de..e7359755f1 100755 --- a/src/tm_mad/one_tm.rb +++ b/src/tm_mad/one_tm.rb @@ -49,8 +49,6 @@ class TransferManager < OpenNebulaDriver def action_transfer(number, script_file) script_text="" - log(number, script_file) - if File.exist?(script_file) open(script_file) {|f| script_text=f.read