I've forgot to mention - Many thanks for Brice helping me bisecting this one!!!!
Ohad On Mon, Oct 12, 2009 at 10:20 AM, Ohad Levy <[email protected]> wrote: > Signed-off-by: Ohad Levy <[email protected]> > --- > lib/puppet/util.rb | 17 ++++++----------- > 1 files changed, 6 insertions(+), 11 deletions(-) > > diff --git a/lib/puppet/util.rb b/lib/puppet/util.rb > index e1e6992..bc7e145 100644 > --- a/lib/puppet/util.rb > +++ b/lib/puppet/util.rb > @@ -185,19 +185,14 @@ module Util > > def binary(bin) > if bin =~ /^\// > - if FileTest.file? bin and FileTest.executable? bin > - return bin > - else > - return nil > - end > + return bin if FileTest.file? bin and FileTest.executable? bin > else > - x = %x{which #{bin} 2>/dev/null}.chomp > - if x == "" > - return nil > - else > - return x > - end > + ENV['PATH'].split(":").each do |dir| > + dest=File.join(dir, bin) > + return dest if FileTest.file? dest and FileTest.executable? > dest > + end > end > + retun nil > end > module_function :binary > > -- > 1.6.0.4 > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "Puppet Developers" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en -~----------~----~----~----~------~----~------~--~---
