a-c-m
/
community.crypto
mirror of https://github.com/ansible-collections/community.crypto.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correctly mark plugins/module_utils/crypto/_obj2txt.py as having two licenses. (#495)

pull/496/head
Felix Fontein 2022-07-25 07:17:56 +02:00 committed by GitHub
parent e4ebca0945
commit e08efe2598
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/module_utils/crypto/_obj2txt.py
View File

@ -10,8 +10,7 @@
# #
# The Apache 2.0 license has been included as LICENSES/Apache-2.0.txt in this collection. # The Apache 2.0 license has been included as LICENSES/Apache-2.0.txt in this collection.
# The BSD License license has been included as LICENSES/BSD-3-Clause.txt in this collection. # The BSD License license has been included as LICENSES/BSD-3-Clause.txt in this collection.
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0 OR BSD-3-Clause
# SPDX-License-Identifier: BSD-3-Clause
# #
# Adapted from cryptography's hazmat/backends/openssl/decode_asn1.py # Adapted from cryptography's hazmat/backends/openssl/decode_asn1.py
# #

3
tests/sanity/extra/licenses.py
View File

@ -30,7 +30,8 @@ def find_licenses(filename, relax=False):
print('%s: found copyright line with "Copyright:". Please remove the colon.' % (filename, )) print('%s: found copyright line with "Copyright:". Please remove the colon.' % (filename, ))
idx = line.find('SPDX-License-Identifier: ') idx = line.find('SPDX-License-Identifier: ')
if idx >= 0: if idx >= 0:
spdx_license_identifiers.append(line[idx + len('SPDX-License-Identifier: '):]) lic_id = line[idx + len('SPDX-License-Identifier: '):]
spdx_license_identifiers.extend(lic_id.split(' OR '))
if 'GNU General Public License' in line: if 'GNU General Public License' in line:
if 'v3.0+' in line: if 'v3.0+' in line:
other_license_identifiers.append('GPL-3.0-or-later') other_license_identifiers.append('GPL-3.0-or-later')