Skip to content

Commit

Permalink
Ignore CAL-1.0 and CAL-1.0-Combined-Work-Exception
Browse files Browse the repository at this point in the history
These licenses contain SPDX tags referring to themselves. This causes
issues in <fsfe#229>. Ignoring them
is a workaround.

Signed-off-by: Carmen Bianca Bakker <[email protected]>
  • Loading branch information
Carmen Bianca Bakker committed May 25, 2020
1 parent 014cc70 commit 614cc0b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ The versions follow [semantic versioning](https://semver.org).

### Fixed

- The licenses CAL-1.0 and CAL-1.0-Combined-Work-Exception contain an SPDX tag
within themselves. Files that are named after these licenses are now ignored.

### Security

## 0.10.1 - 2020-05-14
Expand Down
2 changes: 2 additions & 0 deletions src/reuse/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
re.compile(r"^\.gitkeep$"),
re.compile(r".*\.license$"),
re.compile(r".*\.spdx$"),
# Workaround for https://github.com/fsfe/reuse-tool/issues/229
re.compile(r"^CAL-1.0(-Combined-Work-Exception)?(\..+)?$"),
]

#: Simple structure for holding SPDX information.
Expand Down

0 comments on commit 614cc0b

Please sign in to comment.