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 030df61c99420bfbe02ff6db3bb0585d9b239d21..ba6b54aff40d19ec41c7c0365dfa604412d68913 100644 (file)
--- 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))