diff options
| author | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 10:34:40 +0100 |
|---|---|---|
| committer | Dominic Cleal <dcleal@redhat.com> | 2011-04-13 10:34:40 +0100 |
| commit | fd983410d841fec2408ded0700c841bf201eafbb (patch) | |
| tree | 0628ed2974698b520caf180fedf1b8062e591e35 | |
| parent | 7726dc3f7d9fa45e94e748fe5679e89d96dd817f (diff) | |
| download | puppet-fd983410d841fec2408ded0700c841bf201eafbb.tar.gz puppet-fd983410d841fec2408ded0700c841bf201eafbb.tar.xz puppet-fd983410d841fec2408ded0700c841bf201eafbb.zip | |
(#4258) Fix fd leak opening pkgutil config files
| -rwxr-xr-x | lib/puppet/provider/package/pkgutil.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/puppet/provider/package/pkgutil.rb b/lib/puppet/provider/package/pkgutil.rb index 2661cedef..ab8a507f6 100755 --- a/lib/puppet/provider/package/pkgutil.rb +++ b/lib/puppet/provider/package/pkgutil.rb @@ -23,8 +23,9 @@ Puppet::Type.type(:package).provide :pkgutil, :parent => :sun, :source => :sun d correct_wgetopts = false [ "/opt/csw/etc/pkgutil.conf", "/etc/opt/csw/pkgutil.conf" ].each do |confpath| - pkgutilconf = File.open(confpath) - pkgutilconf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } + File.open(confpath) do |conf| + conf.each {|line| correct_wgetopts = true if line =~ /^\s*wgetopts\s*=.*(-nv|-q|--no-verbose|--quiet)/ } + end end if ! correct_wgetopts Puppet.notice "It is highly recommended that you set 'wgetopts=-nv' in your pkgutil.conf." |