summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorBalint Reczey <balint@balintreczey.hu>2016-08-23 13:53:23 +0200
committerMichael Mann <mmann78@netscape.net>2016-08-23 15:02:31 +0000
commit40ac3c86825d4a15e585035fbae6e9a86424ee4e (patch)
tree8fa872b718efcf62f51098ea487a1ff53536176f /tools
parentc7ca0e88df468989647fc272a798bcd038084d99 (diff)
downloadwireshark-40ac3c86825d4a15e585035fbae6e9a86424ee4e.tar.gz
Documentation with unset license is under project's license (GPL-2+)
doc/idl2deb.pod is licensed explicitly under GPL-2+ it is just not recognized by the check. Change-Id: Iabc7ee6bd6fe9080d6cdd28a29bb4c5f97b0ece9 Reviewed-on: https://code.wireshark.org/review/17268 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Petri-Dish: Balint Reczey <balint@balintreczey.hu> Reviewed-by: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/checklicenses.py40
1 files changed, 5 insertions, 35 deletions
diff --git a/tools/checklicenses.py b/tools/checklicenses.py
index 3591b2fd9d..2e42e797ab 100755
--- a/tools/checklicenses.py
+++ b/tools/checklicenses.py
@@ -83,6 +83,9 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
'wimaxasncp/dictionary.dtd': [
'UNKNOWN',
],
+ 'doc/': [
+ 'UNKNOWN',
+ ],
'docbook/custom_layer_pdf.xsl': [
'UNKNOWN',
],
@@ -207,30 +210,6 @@ PATH_SPECIFIC_WHITELISTED_LICENSES = {
],
}
-# Files pre-existing prior to licensecheck upgrade to v2.16.2.
-# Other new files being added to the source tree that fail checklicenses.py
-# must *not* be added to FIXME_FILES.
-FIXME_FILES = [
- 'doc/captype.pod', # Should it have a license?
- 'doc/dftest.pod',
- 'doc/idl2deb.pod',
- 'doc/mergecap.pod',
- 'doc/reordercap.pod',
- 'doc/wireshark-filter.pod',
- 'doc/androiddump.pod',
- 'doc/ciscodump.pod',
- 'doc/dumpcap.pod',
- 'doc/editcap.pod',
- 'doc/extcap.pod',
- 'doc/randpkt.pod',
- 'doc/randpktdump.pod',
- 'doc/rawshark.pod',
- 'doc/sshdump.pod',
- 'doc/tshark.pod',
- 'doc/wireshark.pod', # wireshark.pod.template
-]
-
-
def check_licenses(options, args):
# Figure out which directory we have to check.
if len(args) == 0:
@@ -275,7 +254,6 @@ def check_licenses(options, args):
success = True
exit_status = 0
- fixme = []
for line in stdout.splitlines():
filename, license = line.split(':', 1)
filename = os.path.relpath(filename.strip(), options.base_directory)
@@ -307,16 +285,8 @@ def check_licenses(options, args):
reason = "'%s' has non-whitelisted license '%s'" % (filename, license)
success = False
- if filename not in FIXME_FILES:
- print(reason)
- exit_status = 1
- else:
- fixme.append(reason)
-
- if fixme:
- print("")
- for line in fixme:
- print(line)
+ print(reason)
+ exit_status = 1
if success:
print("\nSUCCESS\n")