diff options
| author | Cam Cope <cam@dropbox.com> | 2017-05-31 17:49:36 -0700 |
|---|---|---|
| committer | Thom May <thom@chef.io> | 2018-01-30 11:31:20 +0000 |
| commit | daffe59058bc6c1501a59d1e1aa9954b51b072fa (patch) | |
| tree | 7dc020326c34cba16635cf60a0c1541dbcb2aec5 /lib/chef/provider/package | |
| parent | f1368f819ad7091e1c18b7476802040db5a58df9 (diff) | |
| download | chef-daffe59058bc6c1501a59d1e1aa9954b51b072fa.tar.gz | |
convert to arrays, fix logic gating
Diffstat (limited to 'lib/chef/provider/package')
| -rw-r--r-- | lib/chef/provider/package/apt.rb | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/chef/provider/package/apt.rb b/lib/chef/provider/package/apt.rb index ec9501a4b5..9c6feb669f 100644 --- a/lib/chef/provider/package/apt.rb +++ b/lib/chef/provider/package/apt.rb @@ -157,10 +157,12 @@ 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 - '-o Dpkg::Options::="--force-confnew"' - else - '-o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"' + if new_resource.respond_to?(: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"' ] + end end end |