diff options
| author | Matt Robinson <matt@puppetlabs.com> | 2011-05-24 09:54:31 -0700 |
|---|---|---|
| committer | Matt Robinson <matt@puppetlabs.com> | 2011-05-24 09:54:31 -0700 |
| commit | 2a86215498b20155cb588d018c0e1df0a8102f3f (patch) | |
| tree | 2e8356c877afc2e9988acefa373f6355a73b05b7 | |
| parent | 7f826bfc1352ef84b2e990874c6285c5aca66bac (diff) | |
| parent | 107b38a94f8b4e4a0fcca4879a167ab4c955fe4d (diff) | |
| download | puppet-2a86215498b20155cb588d018c0e1df0a8102f3f.tar.gz puppet-2a86215498b20155cb588d018c0e1df0a8102f3f.tar.xz puppet-2a86215498b20155cb588d018c0e1df0a8102f3f.zip | |
Merge branch 'ticket/master/maint-ruby19_fix'
* ticket/master/maint-ruby19_fix:
maint: Fix pacman provider to work with Ruby 1.9
| -rw-r--r-- | lib/puppet/provider/package/pacman.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/pacman_spec.rb | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/puppet/provider/package/pacman.rb b/lib/puppet/provider/package/pacman.rb index 6eb7dbe3d..5e05d147e 100644 --- a/lib/puppet/provider/package/pacman.rb +++ b/lib/puppet/provider/package/pacman.rb @@ -33,7 +33,7 @@ Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Packag fields = [:name, :ensure] hash = {} - process.each { |line| + process.each_line { |line| if match = regex.match(line) fields.zip(match.captures) { |field,value| hash[field] = value diff --git a/spec/unit/provider/package/pacman_spec.rb b/spec/unit/provider/package/pacman_spec.rb index fbe4c446e..679172621 100644 --- a/spec/unit/provider/package/pacman_spec.rb +++ b/spec/unit/provider/package/pacman_spec.rb @@ -1,6 +1,5 @@ -#!/usr/bin/env ruby - -Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f) : Dir.chdir("..") { s.call(f) } }).call("spec/spec_helper.rb") } +#!/usr/bin/env rspec +require 'spec_helper' provider = Puppet::Type.type(:package).provider(:pacman) |