Skip to content

OSL-2.0: Fix “Licensev.” → “License v.” #600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 27, 2018

Conversation

wking
Copy link
Contributor

@wking wking commented Jan 15, 2018

The typo came in with the license in 0162ea9 (Automated, 2016-03-30, #180).

Also add an optional “The ” to match the archived original:

$ curl -s https://web.archive.org/web/20041020171434/http://www.rosenlaw.com/osl2.0.html | grep 'Open Software License' | head -n2
<!-- End Wayback Rewrite JS Include --><h1>The Open Software License<br/> v. 2.0</h1>
<p>This Open Software License (the "License") …

The typo came in with the license in 0162ea9 (Automated, 2016-03-30,
spdx#180).

Also add an optional "The " to match the archived original:

  $ curl -s https://web.archive.org/web/20041020171434/http://www.rosenlaw.com/osl2.0.html | grep 'Open Software License' | head -n2
  <!-- End Wayback Rewrite JS Include --><h1>The Open Software License<br/> v. 2.0</h1>
  <p>This Open Software License (the "License") ...
@wking
Copy link
Contributor Author

wking commented Jan 23, 2018

Rebased around #593 with 7f5922346070f1.

@jlovejoy
Copy link
Member

the title - in terms of no "the" and using "v" instead of "version" follows the guidelines we've used since day 1 for all license titles: https://spdx.org/spdx-license-list/license-list-overview#fields
while I understand now (as per discussion on today's legal call with @goneall ) that this could cause issues for tools/matching - I'm not sure it has so far?
we should fix the missing space as that is purely a typo introduced recently, but I don't think we need to add "the" - if we do that here, then we have a bunch more we may need to do that for. To what value does this add? (again a question for the tool vendors)

@jlovejoy jlovejoy added this to the 3.1 release milestone Jan 25, 2018
@wking
Copy link
Contributor Author

wking commented Jan 26, 2018

while I understand now (as per discussion on today's legal call with @goneall ) that this could cause issues for tools/matching - I'm not sure it has so far?

In master, running the matching tests which landed with #593:

$ git describe
v3.0-38-gaaf585c
$ sed -i 's/Licensev/License v/g' test/simpleTestForGenerator/OSL-2.0.txt
$ make TEST_DATA=test/simpleTestForGenerator validate-canonical-match

The following warning(s) were identified:
        Test for license OSL-2.0 failed: Test for license ID OSL-2.0 failed due to difference found Normal text of license does not match starting at line #1 column #5 "software" when comparing to template text "
This Open Software License (the "License") applies to any original work of authorship (the "Origina...".  Last optional text was not found due to the optional difference: 
        Normal text of license does not match starting at line #1 column #22 "v" when comparing to template text " Open Software Licensev. 2.0"
Completed processing licenses

so unless we add the space to the title, our own test suite will fail to match license text that correctly includes the space. I think that's enough for “has caused an issue with tools/matching”.

… I don't think we need to add "the" - if we do that here, then we have a bunch more we may need to do that for. To what value does this add? (again a question for the tool vendors)

This has the same spdx/tools matching issues as the space above. If we want to match both the upstream text I linked in the commit message (which includes “The”) and our traditional SPDX text (which does not) we need to use either an <optional> or <alt> around the optional “The”. I think we do want to match both the upstream text and our own previous text.

@goneall
Copy link
Member

goneall commented Jan 27, 2018

Since the changes will help the matching, I'll go ahead and merge the changes.

@goneall goneall merged commit 9f1a4eb into spdx:master Jan 27, 2018
@wking wking deleted the osl-2.0-title branch January 27, 2018 20:34
@wking wking mentioned this pull request Jul 5, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants