diff options
| author | Tim Smith <tsmith@chef.io> | 2017-04-05 09:14:25 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2017-04-05 09:14:25 -0700 |
| commit | c4c35d51317de78456b273e0307d7ebbcc48da32 (patch) | |
| tree | d4dd7de6da3bd0b334807d3a97c81c6530984724 | |
| parent | 9eb2675370846729b7484b5b418308d7febff9e5 (diff) | |
| download | chef-c4c35d51317de78456b273e0307d7ebbcc48da32.tar.gz | |
Have knife cookbook generate use SPDX standard license strings
We’re trying to get everything to use these so we can have standardized values in Supermarket. All Rights Reserved is clearly not a standard license and that’s just life.
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | acceptance/data-collector/.acceptance/data-collector-test/metadata.rb | 2 | ||||
| -rw-r--r-- | lib/chef/knife/cookbook_create.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb b/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb index dbd376aa83..34402c8af1 100644 --- a/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb +++ b/acceptance/data-collector/.acceptance/data-collector-test/metadata.rb @@ -1,7 +1,7 @@ name 'data-collector-test' maintainer 'Adam Leff' maintainer_email 'adamleff@chef.io' -license 'Apache 2.0' +license 'Apache-2.0' description 'Installs/Configures data-collector-test' long_description 'Installs/Configures data-collector-test' version '0.1.0' diff --git a/lib/chef/knife/cookbook_create.rb b/lib/chef/knife/cookbook_create.rb index ccb78bb7a6..745e413144 100644 --- a/lib/chef/knife/cookbook_create.rb +++ b/lib/chef/knife/cookbook_create.rb @@ -418,11 +418,11 @@ EOH license_name = case license when "apachev2" - "Apache 2.0" + "Apache-2.0" when "gplv2" - "GNU Public License 2.0" + "GPL-2.0" when "gplv3" - "GNU Public License 3.0" + "GPL-3.0" when "mit" "MIT" when "none" |