summaryrefslogtreecommitdiffstats
path: root/libc/tools
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-07-22 21:24:47 -0700
committerElliott Hughes <enh@google.com>2014-07-22 21:29:00 -0700
commit3758a244cf758046b40f630a11aed41e68c9cfc2 (patch)
tree0865c62cfa06f9d0c6d5d3c5406835a5cced92b2 /libc/tools
parent4d421901e587fd1563da94baf59b015017c01b91 (diff)
downloadbionic-3758a244cf758046b40f630a11aed41e68c9cfc2.zip
bionic-3758a244cf758046b40f630a11aed41e68c9cfc2.tar.gz
bionic-3758a244cf758046b40f630a11aed41e68c9cfc2.tar.bz2
Fix a couple of bugs in generate-NOTICE and regenerate the NOTICE files.
Change-Id: Id6fcb74292e661504d0758bfce24abdc18cb8d32
Diffstat (limited to 'libc/tools')
-rwxr-xr-xlibc/tools/generate-NOTICE.py4
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