diff options
| author | Tim Smith <tsmith@chef.io> | 2017-04-05 10:26:58 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-05 10:26:58 -0700 |
| commit | 33c3e156e9138f2184715503c9f62c35d423c9b4 (patch) | |
| tree | c99aa5820f7e437e64df8d5b1e025511ad674fe2 | |
| parent | 71a65aafc0a24ddc4d3b964d7d2c3524f96149cc (diff) | |
| parent | c4c35d51317de78456b273e0307d7ebbcc48da32 (diff) | |
| download | chef-33c3e156e9138f2184715503c9f62c35d423c9b4.tar.gz | |
Merge pull request #6020 from chef/licenses
Have knife cookbook generate use SPDX standard license strings
| -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" |