diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-04-14 17:22:04 +1000 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-04-14 17:22:04 +1000 |
| commit | 16d1f784cd00f8b3c3381caede44159c309487d7 (patch) | |
| tree | c12cd711c73d15a30980c5bef64639687e2cdb1e | |
| parent | 6a8068b3912d6275efe4005258a06d03363c8944 (diff) | |
| parent | ccbe9f399a5c9f6b853c6a3bb0b004b2d73ac5af (diff) | |
| download | puppet-16d1f784cd00f8b3c3381caede44159c309487d7.tar.gz puppet-16d1f784cd00f8b3c3381caede44159c309487d7.tar.xz puppet-16d1f784cd00f8b3c3381caede44159c309487d7.zip | |
Merge remote branch 'james/tickets/2.6.x/6681' into 2.6.next
* james/tickets/2.6.x/6681:
Fixed #6681 - Remove --force-yes option from aptitude is used
| -rwxr-xr-x | lib/puppet/provider/package/aptitude.rb | 1 |
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. |