nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-20 10:34:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

monkeysphere: Use raw string for re match

Browse Source 
Update changelog.
This commit is contained in:
James Valleroy 2016-09-02 14:40:25 -04:00
parent 3454abdc43
commit ae0bd62b1e
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CHANGELOG.md
View File

@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
## [Unreleased] ## [Unreleased]
### Added ### Added
- Added loading icon for other busy operations. - Added loading icon for other busy operations.
- Added basic front page with shortcuts to web apps, and information
about enabled services.
### Fixed ### Fixed
- users: Fixed checking restricted usernames. - 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. - Updated translations to fix weblate errors.
- Fixed spelling errors in datetime and letsencrypt modules. - Fixed spelling errors in datetime and letsencrypt modules.
- users: Flush nscd cache after user operations. - 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 ### 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. - xmpp: Switched to using ruamel.yaml to modify ejabberd config.
- Exit with error if any of the setup steps fail. - Exit with error if any of the setup steps fail.

2
actions/monkeysphere
View File

@ -145,7 +145,7 @@ def get_monkeysphere_keys(key_id=None):
uid = uid[uid.index(']') + 1:].strip() uid = uid[uid.index(']') + 1:].strip()
keys[-1].setdefault('uids', []).append(uid) 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]['service'] = matches.group(1)
keys[-1]['imported_domains'].append(matches.group(2)) keys[-1]['imported_domains'].append(matches.group(2))
elif line.startswith('OpenPGP fingerprint:'): elif line.startswith('OpenPGP fingerprint:'):