From ae0bd62b1e281fed871d87774f2bf98c090a65ef Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Fri, 2 Sep 2016 14:40:25 -0400 Subject: [PATCH] monkeysphere: Use raw string for re match Update changelog. --- CHANGELOG.md | 9 ++++++++- actions/monkeysphere | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c41b0a0b5..936265e8e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. ## [Unreleased] ### Added - Added loading icon for other busy operations. +- Added basic front page with shortcuts to web apps, and information + about enabled services. ### Fixed - users: Fixed checking restricted usernames. @@ -12,9 +14,14 @@ All notable changes to this project will be documented in this file. - Updated translations to fix weblate errors. - Fixed spelling errors in datetime and letsencrypt modules. - users: Flush nscd cache after user operations. +- monkeysphere: Adopted to using SHA256 fingerprints. +- monkeysphere: Sort items for consistent display. +- monkeysphere: Handle new uid format of gpg2. +- monkeysphere: Fixed handling of unavailable imported domains. ### Changed -- dynamicdns, transmission, upgrades: Allowed Plinth to run as non-root. +- dynamicdns, monkeysphere, transmission, upgrades: Use actions where + root is required, so that Plinth can run as non-root. - xmpp: Switched to using ruamel.yaml to modify ejabberd config. - Exit with error if any of the setup steps fail. diff --git a/actions/monkeysphere b/actions/monkeysphere index 3090cdd6d..b80ef1673 100755 --- a/actions/monkeysphere +++ b/actions/monkeysphere @@ -145,7 +145,7 @@ def get_monkeysphere_keys(key_id=None): uid = uid[uid.index(']') + 1:].strip() keys[-1].setdefault('uids', []).append(uid) - matches = re.match('([a-zA-Z]*)://(.*)(:\d*)?', uid) + matches = re.match(r'([a-zA-Z]*)://(.*)(:\d*)?', uid) keys[-1]['service'] = matches.group(1) keys[-1]['imported_domains'].append(matches.group(2)) elif line.startswith('OpenPGP fingerprint:'):