summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2013-03-21 10:57:23 -0500
committerMonty Taylor <mordred@inaugust.com>2013-03-22 10:41:06 -0400
commit6e8b9ba12c96cbf422edd54a6cb12cbc0df66514 (patch)
tree2a4e6f703c19c24c5e153edce1248ef7b8f7ed43 /openstack/common
parentbf70726d4228ebf3e65aa75b8f0ca6cab5e1e159 (diff)
downloadoslo-6e8b9ba12c96cbf422edd54a6cb12cbc0df66514.tar.gz
oslo-6e8b9ba12c96cbf422edd54a6cb12cbc0df66514.tar.xz
oslo-6e8b9ba12c96cbf422edd54a6cb12cbc0df66514.zip
Include Co-authored-by entries in AUTHORS.
Co-authored-by lines are the way we've decided to indicated shared authorship of a patch, so content from them should be included in the generated AUTHORS file. Fixes bug 1158319. Change-Id: I9dacf78c01f3ad74e696f16a7aa39edb98e8d185
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/setup.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py
index 030df61..dec74fd 100644
--- a/openstack/common/setup.py
+++ b/openstack/common/setup.py
@@ -171,6 +171,14 @@ def generate_authors():
" log --format='%aN <%aE>' | sort -u | "
"egrep -v '" + jenkins_email + "'")
changelog = _run_shell_command(git_log_cmd)
+ signed_cmd = ("git log --git-dir=" + git_dir +
+ " | grep -i Co-authored-by: | sort -u")
+ signed_entries = _run_shell_command(signed_cmd)
+ if signed_entries:
+ new_entries = "\n".join(
+ [signed.split(":", 1)[1].strip()
+ for signed in signed_entries.split("\n") if signed])
+ changelog = "\n".join((changelog, new_entries))
mailmap = _parse_git_mailmap(git_dir)
with open(new_authors, 'w') as new_authors_fh:
new_authors_fh.write(canonicalize_emails(changelog, mailmap))