diff options
Diffstat (limited to 'lib/oxidized/model')
| -rw-r--r-- | lib/oxidized/model/model.rb | 9 | 
1 files changed, 4 insertions, 5 deletions
| diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb index d3f54b9..899b40a 100644 --- a/lib/oxidized/model/model.rb +++ b/lib/oxidized/model/model.rb @@ -133,10 +133,10 @@ module Oxidized          outputs << out        end        procs[:pre].each do |pre_proc| -        outputs.unshift Oxidized::String.new(instance_eval(&pre_proc)) +        outputs.unshift process_cmd_output(instance_eval(&pre_proc), '')        end        procs[:post].each do |post_proc| -        outputs << Oxidized::String.new(instance_eval(&post_proc)) +        outputs << process_cmd_output(instance_eval(&post_proc), '')        end        outputs      end @@ -152,9 +152,8 @@ module Oxidized      private      def process_cmd_output output, name -      if output.class != Oxidized::String -        output = Oxidized::String.new output -      end +      output = Oxidized::String.new output if ::String === output +      output = Oxidized::String.new '' unless Oxidized::String === output        output.set_cmd(name)        output      end | 
