From: Davanum Srinivas Date: Mon, 8 Apr 2013 00:38:08 +0000 (-0400) Subject: Sync with oslo-incubator copy of setup.py X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=c3047304fffac73521722e5468231ebe5a9fc502;p=openstack-build%2Fcinder-build.git Sync with oslo-incubator copy of setup.py Keep up with the changes to the master copy Change-Id: I6b87762a25f11c2548cd8df548a217295b8129d4 --- diff --git a/cinder/openstack/common/setup.py b/cinder/openstack/common/setup.py index 030df61c9..ba6b54aff 100644 --- a/cinder/openstack/common/setup.py +++ b/cinder/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 --git-dir=" + git_dir + + " log | 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))