diff options
author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2019-01-09 13:26:39 -0500 |
---|---|---|
committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2019-01-09 13:26:39 -0500 |
commit | c860f4d729a7e3d51f8bdf2f91fe7fe040792f24 (patch) | |
tree | d208c3f103526d37d5b8c3107cb60f25bf0d7ac7 | |
parent | 943d264c4a69f2c602991d9475886a508d470391 (diff) | |
download | korg-helpers-c860f4d729a7e3d51f8bdf2f91fe7fe040792f24.tar.gz |
Use custom make_msgid for saner message-IDs
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-x | pr-tracker-bot.py | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/pr-tracker-bot.py b/pr-tracker-bot.py index 033d99f..4e2dd60 100755 --- a/pr-tracker-bot.py +++ b/pr-tracker-bot.py @@ -23,6 +23,7 @@ import argparse import email import email.message import email.utils +import random import smtplib import time import subprocess @@ -58,6 +59,19 @@ PULL_BODY_REMOTE_REF_RE = [ logger = logging.getLogger('prtracker') +# Python-2.7 doesn't have a domain= keyword argument, so steal make_msgid from python-3.2+ +def make_msgid(idstring=None, domain='kernel.org'): + timeval = int(time.time()*100) + pid = os.getpid() + randint = random.getrandbits(64) + if idstring is None: + idstring = '' + else: + idstring = '.' + idstring + + return '<%d.%d.%d%s@%s>' % (timeval, pid, randint, idstring, domain) + + def db_save_meta(c): c.execute('DELETE FROM meta') c.execute('''INSERT INTO meta VALUES(?)''', (DB_VERSION,)) @@ -366,7 +380,7 @@ def parse_pull_requests(pirepo, topdir, dryrun): def get_config_from_repo(repo, pitopdir, cmdconfig): config = dict() - args = ['config', '-z', '--local', '--get-regexp', 'prtracker\..*'] + args = ['config', '-z', '--local', '--get-regexp', r'prtracker\..*'] out = git_run_command(repo, args) if not out: return config @@ -563,7 +577,7 @@ def mail_thanks_for_pr(refname, commit_id, merge_id, pirepo, msg_commit_id, conf msg['X-PR-Merge-Refname'] = refname msg['X-PR-Merge-Commit-Id'] = merge_id - msg['Message-Id'] = email.utils.make_msgid('pr-tracker-bot') + msg['Message-Id'] = make_msgid('pr-tracker-bot') msg['Date'] = email.utils.formatdate(localtime=True) # Set to and cc |