diff options
| author | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2019-01-09 14:43:04 -0500 |
|---|---|---|
| committer | Konstantin Ryabitsev <konstantin@linuxfoundation.org> | 2019-01-09 14:43:04 -0500 |
| commit | 2cd5dfa7d141517daebbd2cf6f74bab37191bfae (patch) | |
| tree | 509119b7a74f644b964219ca06e335455987fd25 | |
| parent | c860f4d729a7e3d51f8bdf2f91fe7fe040792f24 (diff) | |
| download | korg-helpers-2cd5dfa7d141517daebbd2cf6f74bab37191bfae.tar.gz | |
Tweak the URL regex to be more strict
We're now matching too many things, so rework a bit to better eliminate
false-positives.
Also, fix locking so it's actually doing what it needs to do.
Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
| -rwxr-xr-x | pr-tracker-bot.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pr-tracker-bot.py b/pr-tracker-bot.py index 4e2dd60..ecbd074 100755 --- a/pr-tracker-bot.py +++ b/pr-tracker-bot.py @@ -52,8 +52,8 @@ PULL_BODY_WITH_COMMIT_ID_RE = [ # I don't like these PULL_BODY_REMOTE_REF_RE = [ - re.compile(r'^\s*((?:[\w+-]+://)?[\w/.@:~-]+)[\s\\]+([\w/._-]+)\s*$', re.MULTILINE | re.IGNORECASE), - re.compile(r'^\s*((?:[\w+-]+://)?[\w/.@:~-]+)\s*$', re.MULTILINE | re.IGNORECASE), + re.compile(r'^\s*([\w+-]+(?:://|@)[\w/.@:~-]+)[\s\\]+([\w/._-]+)\s*$', re.MULTILINE | re.IGNORECASE), + re.compile(r'^\s*([\w+-]+(?:://|@)[\w/.@~-]+)\s*$', re.MULTILINE | re.IGNORECASE), ] logger = logging.getLogger('prtracker') @@ -329,8 +329,8 @@ def parse_pull_requests(pirepo, topdir, dryrun): sys.exit(1) try: - with open(os.path.join(pirepo, '.prtracker.lock'), 'w') as lockfh: - lockf(lockfh, LOCK_EX | LOCK_NB) + lockfh = open(os.path.join(pirepo, '.prtracker.lock'), 'w') + lockf(lockfh, LOCK_EX | LOCK_NB) except IOError: logger.debug('Could not obtain an exclusive lock, assuming another process is running.') return |