summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2019-04-30 12:15:42 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2019-04-30 12:17:05 -0700
commit2ea62e01d77630f5d17935ef7551d21e95aae0d0 (patch)
tree95396835512c385f5eca41c72d68173ffbf3dc74
parentaf6575fd28ff4bf570e5a3cd3b04e114fd12999f (diff)
downloadchef-2ea62e01d77630f5d17935ef7551d21e95aae0d0.tar.gz
rubocop Bundler/DuplicatedGem is annoyinglcg/fix-bundling-in-omnibus
issues against Bundler/DuplicatedGem not understanding if-else blocks have been closed. Signed-off-by: Lamont Granquist <lamont@scriptkiddie.org>
-rw-r--r--Gemfile6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index 3a3caa9be2..30e8d98e52 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,9 +13,11 @@ gem "ohai", git: "https://github.com/chef/ohai.git", branch: "master"
gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.exist?(File.expand_path("../chef-config", __FILE__))
if File.exist?(File.expand_path("../chef-bin", __FILE__))
- gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__) # bundling in a git checkout
+ # bundling in a git checkout
+ gem "chef-bin", path: File.expand_path("../chef-bin", __FILE__)
else
- gem "chef-bin" # bundling in omnibus
+ # bundling in omnibus
+ gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem
end
gem "cheffish", "~> 14"