diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-28 20:58:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-28 20:58:35 +0000 |
| commit | 45d2b7c01e220d87860e485a49369cfe37dc1bfc (patch) | |
| tree | beaefc7dd075b00405dd2158a1d9f21ed04d774e /openstack/common | |
| parent | 2319a24e3a6e89078501bd51967fda3576ecf033 (diff) | |
| parent | 6f0a0f4e69be5dd54559697794ee8d334a7343d1 (diff) | |
| download | oslo-45d2b7c01e220d87860e485a49369cfe37dc1bfc.tar.gz oslo-45d2b7c01e220d87860e485a49369cfe37dc1bfc.tar.xz oslo-45d2b7c01e220d87860e485a49369cfe37dc1bfc.zip | |
Merge "Ignore the stackforge jenkins email address"
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/setup.py | 4 |
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: |