summaryrefslogtreecommitdiff
path: root/lib/chef/chef_fs
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2017-04-04 18:41:06 +0100
committerGitHub <noreply@github.com>2017-04-04 18:41:06 +0100
commit4b8cd07d8049701acdf5344ca159f9e43561a356 (patch)
tree7e910fa98e18d7217b1f7623ee176c807cc22e21 /lib/chef/chef_fs
parentba719eb02ebab4feb3201f7b1225e5059076cadb (diff)
parentd51d31cf0c514d353cc6883a4af77c11fe802ee9 (diff)
downloadchef-4b8cd07d8049701acdf5344ca159f9e43561a356.tar.gz
Merge pull request #5850 from criteo-forks/rb_support
Add real support for rb files (at least roles) in knife-serve
Diffstat (limited to 'lib/chef/chef_fs')
-rw-r--r--lib/chef/chef_fs/chef_fs_data_store.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/chef/chef_fs/chef_fs_data_store.rb b/lib/chef/chef_fs/chef_fs_data_store.rb
index 46fe5c4dd3..0c8f12f1be 100644
--- a/lib/chef/chef_fs/chef_fs_data_store.rb
+++ b/lib/chef/chef_fs/chef_fs_data_store.rb
@@ -768,7 +768,7 @@ class Chef
end
elsif path.length == 2 && path[0] != "cookbooks"
- path[1] = path[1][0..-6]
+ path[1] = path[1].gsub(/\.(rb|json)/, "")
end
path