summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-02-02 11:49:53 -0800
committerLamont Granquist <lamont@scriptkiddie.org>2018-02-02 11:49:53 -0800
commitccf9036ab51101acbf9e9dab74fc31e41327f757 (patch)
treeeb8b96a555efe4772cd42f761d1e59f1ac5a1ad0
parent5da5f764f442a6d5bf3e20686b8f239eedb38a73 (diff)
downloadchef-ccf9036ab51101acbf9e9dab74fc31e41327f757.tar.gz
Revert "guard against somehow being called by the package resource"
This reverts commit 5da5f764f442a6d5bf3e20686b8f239eedb38a73.
-rw-r--r--lib/chef/provider/package/apt.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb
index a7af453d9f..d307ba5003 100644
--- a/lib/chef/provider/package/apt.rb
+++ b/lib/chef/provider/package/apt.rb
@@ -160,7 +160,7 @@ class Chef
# It doesn't make sense to install packages in a scenario that can
# result in a prompt. Have users decide up-front whether they want to
# forcibly overwrite the config file, otherwise preserve it.
- if new_resource.respond_to?(:overwrite_config_files) && new_resource.overwrite_config_files
+ if new_resource.overwrite_config_files
[ "-o", "Dpkg::Options::=--force-confnew" ]
else
[ "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold" ]