summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-07-22 03:56:59 +0000
committerGerrit Code Review <review@openstack.org>2013-07-22 03:56:59 +0000
commit0243b7ae33cad1e7c849fd9365881ffe4dfcecf3 (patch)
tree0a4c12a0d594a38be0a6df62a20c12da0b647d62
parentacba610089875951273b507e5b1aca77394840bd (diff)
parent29afae0bf24ebd513291668a0dd3b57d7c25a782 (diff)
downloadpbr-0243b7ae33cad1e7c849fd9365881ffe4dfcecf3.tar.gz
Merge "Ignore project creator while generating AUTHORS"
-rw-r--r--pbr/packaging.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/pbr/packaging.py b/pbr/packaging.py
index 04e3290..c33f401 100644
--- a/pbr/packaging.py
+++ b/pbr/packaging.py
@@ -275,14 +275,14 @@ def generate_authors(git_dir=None, dest_dir='.', option_dict=dict()):
and not os.access(new_authors, os.W_OK)):
return
log.info('[pbr] Generating AUTHORS')
- jenkins_email = 'jenkins@review'
+ ignore_emails = '(jenkins@review|infra@lists)'
if git_dir is None:
git_dir = _get_git_directory()
if git_dir:
# don't include jenkins email address in AUTHORS file
git_log_cmd = ("git --git-dir=" + git_dir +
" log --format='%aN <%aE>' | sort -u | "
- "egrep -v '" + jenkins_email + "'")
+ "egrep -v '" + ignore_emails + "'")
changelog = _run_shell_command(git_log_cmd)
signed_cmd = ("git log --git-dir=" + git_dir +
" | grep -i Co-authored-by: | sort -u")