summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2017-04-10 18:30:06 -0700
committerNoah Kantrowitz <noah@coderanger.net>2017-04-10 18:30:06 -0700
commit34a79a6cf8be2fe491e1651b5a61f02d4854c07b (patch)
tree8874b448b78823ce0ace66896fe7c3963a843a36 /lib
parent5932782cabcdc434e431711027af1211d7e0d31c (diff)
downloadchef-34a79a6cf8be2fe491e1651b5a61f02d4854c07b.tar.gz
Fix expand_options to cope with arrays too.
Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/chef/provider/package.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/provider/package.rb b/lib/chef/provider/package.rb
index 65dda05f85..4a5a6e2e4d 100644
--- a/lib/chef/provider/package.rb
+++ b/lib/chef/provider/package.rb
@@ -297,7 +297,7 @@ class Chef
def expand_options(options)
# its deprecated but still work to do to deprecate it fully
#Chef.deprecated(:package_misc, "expand_options is deprecated, use shell_out_compact or shell_out_compact_timeout instead")
- options ? " #{options}" : ""
+ options ? " #{options.is_a?(Array) ? Shellwords.join(options) : options}" : ""
end
# Check the current_version against either the candidate_version or the new_version