diff options
author | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
---|---|---|
committer | Luke Kanies <luke@madstop.com> | 2008-05-20 10:19:10 -0500 |
commit | fe157f239a301abb52f81c62719355c8e50c970c (patch) | |
tree | 2ff683d14dbf5c95a99410fe1d12300368cf497e /lib/puppet/provider/package/rpm.rb | |
parent | 3cb0d60d3d0870f1d9ac83e5dbeaa06d2888231f (diff) | |
parent | 84a787a2a764a5035f7cbb8d30f94fc601bed154 (diff) | |
download | puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.gz puppet-fe157f239a301abb52f81c62719355c8e50c970c.tar.xz puppet-fe157f239a301abb52f81c62719355c8e50c970c.zip |
Merge branch '0.24.x'
Conflicts:
CHANGELOG
spec/integration/defaults.rb
spec/integration/node/catalog.rb
spec/unit/rails.rb
spec/unit/type/mount.rb
Diffstat (limited to 'lib/puppet/provider/package/rpm.rb')
-rwxr-xr-x | lib/puppet/provider/package/rpm.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/rpm.rb b/lib/puppet/provider/package/rpm.rb index 98ca1efa6..35684e11d 100755 --- a/lib/puppet/provider/package/rpm.rb +++ b/lib/puppet/provider/package/rpm.rb @@ -67,7 +67,7 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr end cmd = [command(:rpm), "-q", "--qf", "#{NEVRAFORMAT}\n", "-p", "#{@resource[:source]}"] - h = nevra_to_hash(execfail(cmd, Puppet::Error)) + h = self.class.nevra_to_hash(execfail(cmd, Puppet::Error)) return h[:ensure] end |