fix condition for concatenating =

Author: AshelyTC

spdxexp/extracts_test.go

@@ -16,8 +16,10 @@ func TestExtractLicenses(t *testing.T) {
 		{"AND'ed licenses", "MIT AND Apache-2.0", []string{"MIT", "Apache-2.0"}},
 		{"AND'ed & OR'ed licenses", "(MIT AND Apache-2.0) OR GPL-3.0", []string{"GPL-3.0", "MIT", "Apache-2.0"}},
 		{"ONLY modifiers", "LGPL-2.1-only OR MIT OR BSD-3-Clause", []string{"MIT", "BSD-3-Clause", "LGPL-2.1-only"}},
-		{"WITH modifiers", "GPL-2.0-or-later WITH Bison-exception-2.2", []string{"GPL-2.0-or-later+ WITH Bison-exception-2.2"}},
+		{"WITH modifiers", "GPL-2.0-or-later WITH Bison-exception-2.2", []string{"GPL-2.0-or-later WITH Bison-exception-2.2"}},
 		{"Invalid SPDX expression", "MIT OR INVALID", nil},
+		{"+ operator in GPL", "GPL-2.0-Or-later", []string{"GPL-2.0-or-later"}},
+		{"+ operator in Apache", "APACHE-2.0+", []string{"Apache-2.0+"}},
 	}
 
 	for _, test := range tests {

spdxexp/node.go

@@ -150,7 +150,7 @@ func (n *node) reconstructedLicenseString() *string {
 	switch n.role {
 	case licenseNode:
 		license := *n.license()
-		if n.hasPlus() {
+		if n.hasPlus() && !strings.HasSuffix(strings.ToLower(license), "-or-later") {
 			license += "+"
 		}
 		if n.hasException() {