summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRanjib Dey <ranjib@pagerduty.com>2014-03-21 16:18:23 -0700
committerBryan McLellan <btm@getchef.com>2014-04-10 05:04:08 -0700
commit726304824f427028987e76d6d7050334fe69eea3 (patch)
treeea7b582a656b93141b0e857ab4693e3c969cda96
parent2404f19c9e80d869fc1033230139fa935ab06903 (diff)
downloadchef-726304824f427028987e76d6d7050334fe69eea3.tar.gz
dont check for dependencies if include-dependency is set to false
-rw-r--r--lib/chef/knife/cookbook_upload.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/chef/knife/cookbook_upload.rb b/lib/chef/knife/cookbook_upload.rb
index 9d6e0d438d..ed8f49a4ec 100644
--- a/lib/chef/knife/cookbook_upload.rb
+++ b/lib/chef/knife/cookbook_upload.rb
@@ -72,7 +72,8 @@ class Chef
option :depends,
:short => "-d",
:long => "--include-dependencies",
- :description => "Also upload cookbook dependencies"
+ :description => "Also upload cookbook dependencies",
+ :boolean => true
def run
# Sanity check before we load anything from the server
@@ -238,7 +239,7 @@ WARNING
cookbooks.each do |cb|
ui.info("Uploading #{cb.name.to_s.ljust(justify_width + 10)} [#{cb.version}]")
check_for_broken_links!(cb)
- check_for_dependencies!(cb)
+ check_for_dependencies!(cb) if config[:depends]
end
Chef::CookbookUploader.new(cookbooks, config[:cookbook_path], :force => config[:force], :concurrency => config[:concurrency]).upload_cookbooks
rescue Chef::Exceptions::CookbookFrozen => e