lib/linux_admin/common.rb in linux_admin-0.5.1 vs lib/linux_admin/common.rb in linux_admin-0.5.2
- old
+ new
@@ -10,26 +10,27 @@
params = options[:params] || options[:parameters]
launch_params = {}
launch_params[:chdir] = options[:chdir] if options[:chdir]
- output = ""
- error = ""
- status = nil
+ output = ""
+ error = ""
+ status = nil
+ command_line = build_cmd(cmd, params)
begin
- output, error = launch(build_cmd(cmd, params), launch_params)
+ output, error = launch(command_line, launch_params)
status = exitstatus
ensure
output ||= ""
error ||= ""
self.exitstatus = nil
end
rescue Errno::ENOENT => err
raise NoSuchFileError.new(err.message) if NoSuchFileError.detected?(err.message)
raise
else
- CommandResult.new(output, error, status)
+ CommandResult.new(command_line, output, error, status)
end
def run!(cmd, options = {})
params = options[:params] || options[:parameters]
command_result = run(cmd, options)