summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbungeman <bungeman@chromium.org>2015-06-11 13:11:55 -0700
committerCommit bot <commit-bot@chromium.org>2015-06-11 20:12:30 +0000
commitfe6d900263c3559e0e3dfb1cd3446254ed013a73 (patch)
treeb75fae38296a881545ce2eda53e568f45d019ae4
parent2b0748adaaf7e695a2bb5997d085b1b9e68437aa (diff)
downloadchromium_src-fe6d900263c3559e0e3dfb1cd3446254ed013a73.zip
chromium_src-fe6d900263c3559e0e3dfb1cd3446254ed013a73.tar.gz
chromium_src-fe6d900263c3559e0e3dfb1cd3446254ed013a73.tar.bz2
Sort licenses by name.
The list of licenses in chrome://credits is currently sorted by the full path name to the project in Chromium. This leads to a stable order, but appears essentially unsorted to the user. Instead, sort the list by the project name. Review URL: https://codereview.chromium.org/1180843004 Cr-Commit-Position: refs/heads/master@{#334024}
-rwxr-xr-xtools/licenses.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/licenses.py b/tools/licenses.py
index 8790c8d..6b8311a 100755
--- a/tools/licenses.py
+++ b/tools/licenses.py
@@ -444,7 +444,7 @@ def GenerateCredits():
entry_template = open(os.path.join(root, 'chrome', 'browser', 'resources',
'about_credits_entry.tmpl'), 'rb').read()
entries = []
- for path in sorted(third_party_dirs):
+ for path in third_party_dirs:
try:
metadata = ParseDir(path, root)
except LicenseError:
@@ -457,13 +457,19 @@ def GenerateCredits():
'url': metadata['URL'],
'license': open(metadata['License File'], 'rb').read(),
}
- entries.append(EvaluateTemplate(entry_template, env))
+ entry = {
+ 'name': metadata['Name'],
+ 'content': EvaluateTemplate(entry_template, env),
+ }
+ entries.append(entry)
+ entries.sort(key=lambda entry: (entry['name'], entry['content']))
+ entries_contents = '\n'.join([entry['content'] for entry in entries])
file_template = open(os.path.join(root, 'chrome', 'browser', 'resources',
'about_credits.tmpl'), 'rb').read()
template_contents = "<!-- Generated by licenses.py; do not edit. -->"
template_contents += EvaluateTemplate(file_template,
- {'entries': '\n'.join(entries)},
+ {'entries': entries_contents},
escape=False)
if len(sys.argv) == 3: