diff options
| author | Elliott Hughes <enh@google.com> | 2014-07-23 16:37:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-22 16:25:43 +0000 |
| commit | ea42a6caea9d5cb5a92939ba0696856306b1d56b (patch) | |
| tree | 8839def1f56ae447aab3af3d28e62f9f8229a056 /libc/tools | |
| parent | e26ac7f776c4011d17e7609efafa116ac4db25ff (diff) | |
| parent | 3758a244cf758046b40f630a11aed41e68c9cfc2 (diff) | |
| download | bionic-ea42a6caea9d5cb5a92939ba0696856306b1d56b.zip bionic-ea42a6caea9d5cb5a92939ba0696856306b1d56b.tar.gz bionic-ea42a6caea9d5cb5a92939ba0696856306b1d56b.tar.bz2 | |
Merge "Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files."
Diffstat (limited to 'libc/tools')
| -rwxr-xr-x | libc/tools/generate-NOTICE.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/tools/generate-NOTICE.py b/libc/tools/generate-NOTICE.py index 6d4c761..4c9e927 100755 --- a/libc/tools/generate-NOTICE.py +++ b/libc/tools/generate-NOTICE.py @@ -77,7 +77,7 @@ def ExtractCopyrightAt(lines, i): for line in lines[start:end]: line = line.replace("\t", " ") line = line.replace("/* ", "") - line = line.replace(" * ", "") + line = re.sub("^ \* ", "", line) line = line.replace("** ", "") line = line.replace("# ", "") if line.startswith("++Copyright++"): @@ -144,7 +144,7 @@ for arg in args: i = 0 while i < len(lines): - if "Copyright" in lines[i]: + if "Copyright" in lines[i] and not "__COPYRIGHT" in lines[i]: i = ExtractCopyrightAt(lines, i) i += 1 |