Skip to content

Commit 3cae615

Browse files
committed
Make apache-2.0 and lgpl rules more specific
These rules are AND rules. Thus they should only match if both licenses are actually detected in the text. There are a bunch of rules that have similar problems. Since the rules touched in this diff caused problems for us, I am just touching them and and consider remaining rules out of scope. Signed-off-by: Alexander zur Bonsen <alexander.zur.bonsen@tngtech.com>
1 parent 930e30e commit 3cae615

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/licensedcode/data/rules/apache-2.0_and_lgpl-2.1_1.RULE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ referenced_filenames:
99

1010
distributed pursuant to the terms of two different licenses.
1111
The user interface (located in ui/ in this distribution) is governed by
12-
the Apache License version 2.0. The rest of this distribution is
13-
governed by the GNU Lesser General Public License version 2.1.
14-
See COPYING.LGPL and COPYING.ASL2.
12+
the {{Apache License version 2.0}}. The rest of this distribution is
13+
governed by the {{GNU Lesser General Public License version 2.1}}.
14+
See COPYING.LGPL and COPYING.ASL2.

src/licensedcode/data/rules/apache-2.0_and_lgpl-2.1_2.RULE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ignorable_urls:
99
- http://www.apache.org/licenses/LICENSE-2.0
1010
---
1111

12-
Licensed under the Apache License, Version 2.0 (the "License");
12+
Licensed under the {{Apache License, Version 2.0}} (the "License");
1313
you may not use this file except in compliance with the License.
1414
You may obtain a copy of the License at
1515
.
@@ -21,5 +21,5 @@ Licensed under the Apache License, Version 2.0 (the "License");
2121
See the License for the specific language governing permissions and
2222
limitations under the License.
2323
.
24-
On Debian systems a full copy of the LGPL 2.1 can be found at
25-
/usr/share/common-licenses/Apache-2.0
24+
On Debian systems a full copy of the {{LGPL 2.1}} can be found at
25+
/usr/share/common-licenses/Apache-2.0

src/licensedcode/data/rules/apache-2.0_and_lgpl-2.1_4.RULE

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ignorable_urls:
1010
- http://www.apache.org/licenses/LICENSE-2.0
1111
---
1212

13-
Licensed under the Apache License, Version 2.0 (the "License");
13+
Licensed under the {{Apache License, Version 2.0}} (the "License");
1414
you may not use this file except in compliance with the License.
1515
You may obtain a copy of the License at
1616
.
@@ -22,5 +22,5 @@ Licensed under the Apache License, Version 2.0 (the "License");
2222
See the License for the specific language governing permissions and
2323
limitations under the License.
2424
.
25-
On Debian GNU/Linux systems a full copy of the LGPL 2.1 can be found at
26-
/usr/share/common-licenses/Apache-2.0
25+
On Debian GNU/Linux systems a full copy of the {{LGPL 2.1}} can be found at
26+
/usr/share/common-licenses/Apache-2.0

0 commit comments

Comments
 (0)