summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xlib/puppet/provider/package/apt.rb3
-rwxr-xr-xspec/unit/provider/package/apt.rb7
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/puppet/provider/package/apt.rb b/lib/puppet/provider/package/apt.rb
index 7bbbcfe03..c43bb4dfc 100755
--- a/lib/puppet/provider/package/apt.rb
+++ b/lib/puppet/provider/package/apt.rb
@@ -64,8 +64,9 @@ Puppet::Type.type(:package).provide :apt, :parent => :dpkg, :source => :dpkg do
when true, false, Symbol
# pass
else
- # Add the package version
+ # Add the package version and --force-yes option
str += "=%s" % should
+ cmd << "--force-yes"
end
cmd << :install << str
diff --git a/spec/unit/provider/package/apt.rb b/spec/unit/provider/package/apt.rb
index 25d74bf90..861029838 100755
--- a/spec/unit/provider/package/apt.rb
+++ b/spec/unit/provider/package/apt.rb
@@ -109,6 +109,13 @@ Version table:
@provider.install
end
+ it "should use --force-yes if a package version is specified" do
+ @resource.expects(:[]).with(:ensure).returns "1.0"
+ @provider.expects(:aptget).with { |*command| command.include?("--force-yes") }
+
+ @provider.install
+ end
+
it "should do a quiet install" do
@provider.expects(:aptget).with { |*command| command.include?("-q") }