@@ -75,25 +75,24 @@ def initialize(tm_type, options = {})
7575 # Driver Action: TRANSFER id script_file
7676 # Executes a transfer script
7777 def action_transfer ( id , script_file )
78- begin
79- script = parse_script ( script_file )
80- if script . nil?
81- return send_message ( 'TRANSFER' , RESULT [ :failure ] , id ,
82- "Transfer file '#{ script_file } ' does not exist" )
83- end
78+ script = parse_script ( script_file )
8479
85- script . each do |command |
86- result , info = do_transfer_action ( id , command )
80+ if script . nil?
81+ return send_message ( 'TRANSFER' , RESULT [ :failure ] , id ,
82+ "Transfer file '#{ script_file } ' does not exist" )
83+ end
8784
88- if result == RESULT [ :failure ]
89- return send_message ( 'TRANSFER' , result , id , info )
90- end
91- end
85+ script . each do |command |
86+ result , info = do_transfer_action ( id , command )
9287
93- send_message ( 'TRANSFER' , RESULT [ :success ] , id )
94- rescue StandardError => e
95- send_message ( 'TRANSFER' , RESULT [ :failure ] , id , e . message )
88+ if result == RESULT [ :failure ]
89+ return send_message ( 'TRANSFER' , result , id , info )
90+ end
9691 end
92+
93+ send_message ( 'TRANSFER' , RESULT [ :success ] , id )
94+ rescue StandardError => e
95+ send_message ( 'TRANSFER' , RESULT [ :failure ] , id , e . message )
9796 end
9897
9998 # Executes a single transfer action (command), as returned by the parse
0 commit comments