summaryrefslogtreecommitdiffstats
path: root/openstack
diff options
context:
space:
mode:
authorDoug Hellmann <doug.hellmann@dreamhost.com>2012-09-28 15:55:14 -0400
committerDoug Hellmann <doug.hellmann@dreamhost.com>2012-09-28 15:55:57 -0400
commit6f0a0f4e69be5dd54559697794ee8d334a7343d1 (patch)
tree500e46f861d480856eaffd804c7ecc5982908b5a /openstack
parent87a2fd76e778251668f0c517084418dfda9cdaf0 (diff)
downloadoslo-6f0a0f4e69be5dd54559697794ee8d334a7343d1.tar.gz
oslo-6f0a0f4e69be5dd54559697794ee8d334a7343d1.tar.xz
oslo-6f0a0f4e69be5dd54559697794ee8d334a7343d1.zip
Ignore the stackforge jenkins email address
Update generate_authors to ignore the email address for the stackforge jenkins as well as the main openstack jenkins, to ignore commits in the history of projects that were on stackforge before moving over to the main server (such as ceilometer). Change-Id: I86d93ba0f358d5d33278847ba8de039642dd54b7 Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
Diffstat (limited to 'openstack')
-rw-r--r--openstack/common/setup.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/openstack/common/setup.py b/openstack/common/setup.py
index 628f5e3..317e82d 100644
--- a/openstack/common/setup.py
+++ b/openstack/common/setup.py
@@ -191,14 +191,14 @@ def write_git_changelog():
def generate_authors():
"""Create AUTHORS file using git commits."""
- jenkins_email = 'jenkins@review.openstack.org'
+ jenkins_email = 'jenkins@review.(openstack|stackforge).org'
old_authors = 'AUTHORS.in'
new_authors = 'AUTHORS'
if not os.getenv('SKIP_GENERATE_AUTHORS'):
if os.path.isdir('.git'):
# don't include jenkins email address in AUTHORS file
git_log_cmd = ("git log --format='%aN <%aE>' | sort -u | "
- "grep -v " + jenkins_email)
+ "egrep -v '" + jenkins_email + "'")
changelog = _run_shell_command(git_log_cmd)
mailmap = parse_mailmap()
with open(new_authors, 'w') as new_authors_fh: