diff options
| -rwxr-xr-x | lib/puppet/provider/package/apt.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/type.rb | 2 | ||||
| -rw-r--r-- | test/puppettest.rb | 4 | ||||
| -rw-r--r-- | test/types/service.rb | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb index 52b4fa8ce..c0fa0f3a5 100755 --- a/lib/puppet/provider/package/apt.rb +++ b/lib/puppet/provider/package/apt.rb @@ -59,7 +59,7 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg do # What's the latest package version available? def latest - cmd = "#{command(:aptcache)}he showpkg %s" % @model[:name] + cmd = "#{command(:aptcache)} showpkg %s" % @model[:name] begin output = execute(cmd) rescue Puppet::ExecutionFailure diff --git a/lib/puppet/type.rb b/lib/puppet/type.rb index 8f29d79bf..d87cbcbd3 100644 --- a/lib/puppet/type.rb +++ b/lib/puppet/type.rb @@ -1264,7 +1264,7 @@ class Type < Puppet::Element end # Remove the reference to the provider. - if defined? @provider + if self.provider @provider.clear @provider = nil end diff --git a/test/puppettest.rb b/test/puppettest.rb index 9ff8e5c46..f094045cd 100644 --- a/test/puppettest.rb +++ b/test/puppettest.rb @@ -69,6 +69,10 @@ module TestPuppet true end + def clear + @model = nil + end + def initialize(model) @model = model end diff --git a/test/types/service.rb b/test/types/service.rb index 176f84818..e1d2629a2 100644 --- a/test/types/service.rb +++ b/test/types/service.rb @@ -167,7 +167,7 @@ class TestLocalService < Test::Unit::TestCase # test refreshing it assert_nothing_raised() { - service.provider.refresh + service.refresh } # now stop it |