summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-03-11 21:23:29 +1100
committerJames Turnbull <james@lovedthanlost.net>2011-03-12 03:25:43 +1100
commitccbe9f399a5c9f6b853c6a3bb0b004b2d73ac5af (patch)
treef49bab4933e6af6fb3e94a352cc534d1392dcc58
parent86c60354da1d5a2a54baf6dbd92677a12701423d (diff)
downloadpuppet-ccbe9f399a5c9f6b853c6a3bb0b004b2d73ac5af.tar.gz
puppet-ccbe9f399a5c9f6b853c6a3bb0b004b2d73ac5af.tar.xz
puppet-ccbe9f399a5c9f6b853c6a3bb0b004b2d73ac5af.zip
Fixed #6681 - Remove --force-yes option from aptitude is used
-rwxr-xr-xlib/puppet/provider/package/aptitude.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/puppet/provider/package/aptitude.rb b/lib/puppet/provider/package/aptitude.rb
index 8bdf984e6..2eafd3ef8 100755
--- a/lib/puppet/provider/package/aptitude.rb
+++ b/lib/puppet/provider/package/aptitude.rb
@@ -12,6 +12,7 @@ Puppet::Type.type(:package).provide :aptitude, :parent => :apt, :source => :dpkg
args.flatten!
# Apparently aptitude hasn't always supported a -q flag.
args.delete("-q") if args.include?("-q")
+ args.delete("--force-yes") if args.include?("--force-yes")
output = aptitude(*args)
# Yay, stupid aptitude doesn't throw an error when the package is missing.