Skip to content
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

Match erroneous punctuation in Verbatim-man-pages #1334

Merged
merged 1 commit into from
Sep 16, 2021

Conversation

seabass-labrax
Copy link
Contributor

The trailing characters in the license text are likely to be removed upstream. However, as users of SPDX may wish to run automated license matchers on older files, this commit adds alt elements to match license texts containing the erroneous punctuation.

Related to issue #1310 and pull request #1319. Replaces pull request #1331.

The trailing characters in the license text are likely to be removed
upstream. However, as users of SPDX may wish to run automated license
matchers on older files, this commit adds `alt` elements to match
license texts containing the erroneous punctuation.
@jlovejoy
Copy link
Member

oh, I see now - there are extra periods at the end of each line in that one paragraph - ugh!
As per our matching guidelines, I guess we need to accommodate!

@jlovejoy jlovejoy merged commit fafa781 into spdx:master Sep 16, 2021
@jlovejoy jlovejoy added this to the Later Release milestone Sep 16, 2021
@jlovejoy jlovejoy added the XML markup change potential change or addition to XML markup in license label Sep 16, 2021
@seabass-labrax
Copy link
Contributor Author

Thanks for merging, @jlovejoy!

@seydel1847
Copy link

seydel1847 commented Oct 28, 2021

Still there is discrepancy between json file data and web resources.
These files are not available on the web:
https://spdx.org/licenses/Verbatim-man-pages.html
https://spdx.org/licenses/Verbatim-man-pages.json

Error is:
404 Not Found
Code: NoSuchKey
Message: The specified key does not exist.
Key: licenses/Verbatim-man-pages.json
RequestId: BS47521TNFYNBN5M
HostId: NVLE+ESl0oWuUMRiOcRbNkpKUMVqlIf3ESdp30lFICBsamokBUensXKh+IsHpb2/4jb+iSHu++s=
An Error Occurred While Attempting to Retrieve a Custom Error Document
Code: NoSuchKey
Message: The specified key does not exist.
Key: error.html

But links are mentioned in git repo in file: '\license-list-data\json\licenses.json' in "licenseListVersion": "fafa781":

{
  "reference": "https://spdx.org/licenses/Verbatim-man-pages.html",
  "isDeprecatedLicenseId": false,
  "detailsUrl": "https://spdx.org/licenses/Verbatim-man-pages.json",
  "referenceNumber": 333,
  "name": "The \"Verbatim\" License (man-pages)",
  "licenseId": "Verbatim-man-pages",
  "seeAlso": [
    "https://www.kernel.org/doc/man-pages/licenses.html"
  ],
  "isOsiApproved": false
},

@swinslow swinslow modified the milestones: Later Release, 3.15 Oct 28, 2021
@seabass-labrax
Copy link
Contributor Author

seabass-labrax commented Oct 28, 2021 via email

@seydel1847
Copy link

Ok, that is fine! :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
XML markup change potential change or addition to XML markup in license
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants