Merge pull request #10685 from kthchew/licenses-with-plus

utils/spdx: correctly detect non-deprecated licenses with plus
Homebrew · Feb 24, 2021 · 9b94234 · 9b94234
2 parents 3efab3e + edead95
commit 9b94234
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/Library/Homebrew/test/utils/spdx_spec.rb b/Library/Homebrew/test/utils/spdx_spec.rb
@@ -132,10 +132,18 @@
       expect(described_class.deprecated_license?("GPL-1.0")).to eq true
     end
 
+    it "returns true for deprecated license identifier with plus" do
+      expect(described_class.deprecated_license?("GPL-1.0+")).to eq true
+    end
+
     it "returns false for non-deprecated license identifier" do
       expect(described_class.deprecated_license?("MIT")).to eq false
     end
 
+    it "returns false for non-deprecated license identifier with plus" do
+      expect(described_class.deprecated_license?("EPL-1.0+")).to eq false
+    end
+
     it "returns false for invalid license identifier" do
       expect(described_class.deprecated_license?("foo")).to eq false
     end

diff --git a/Library/Homebrew/utils/spdx.rb b/Library/Homebrew/utils/spdx.rb
@@ -78,6 +78,7 @@ def deprecated_license?(license)
     return false if ALLOWED_LICENSE_SYMBOLS.include? license
     return false unless valid_license?(license)
 
+    license = license.delete_suffix "+"
     license_data["licenses"].none? do |spdx_license|
       spdx_license["licenseId"] == license && !spdx_license["isDeprecatedLicenseId"]
     end