summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-09-19 12:42:12 -0700
committerClaire McQuin <claire@getchef.com>2014-09-22 11:22:30 -0700
commitfdf6490fbebd4c102624bacb6e8eee8d0b2fb031 (patch)
treef82872d8ba7768a0d262701dc20415c1d309d868
parent296ea46a56dd3057657220de17dc87b8eecb5a7c (diff)
downloadchef-fdf6490fbebd4c102624bacb6e8eee8d0b2fb031.tar.gz
Excape path for globbing.
-rw-r--r--lib/chef/knife/data_bag_from_file.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/knife/data_bag_from_file.rb b/lib/chef/knife/data_bag_from_file.rb
index 4c90fe6c6c..aaa1ed4f64 100644
--- a/lib/chef/knife/data_bag_from_file.rb
+++ b/lib/chef/knife/data_bag_from_file.rb
@@ -126,7 +126,7 @@ class Chef
paths = Array.new
args.each do |path|
if File.directory?(path)
- paths.concat(Dir.glob(File.join(path, "*.json")))
+ paths.concat(Dir.glob(File.join(Chef::Util::PathHelper.escape_glob(path), "*.json")))
else
paths << path
end