Infrastructure/fedora-infrastructure
1
0
Fork 0
Code Issues 70 Pull requests Projects Releases Packages Wiki Activity Actions

Handle case where user doesn't have gpg_keyid set. Fixes ticket #25

Browse source
This commit is contained in:
Ricky Zhou (周家杰) 2008-03-13 00:56:05 -04:00
parent c30cf1839e
commit cfd455e4cc
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fas/fas/templates/master.html
View file

@ -19,6 +19,7 @@
<div id="wrapper"> <div id="wrapper">
<div id="head"> <div id="head">
<h1><a href="http://fedoraproject.org/">${_('Fedora')}</a></h1> <h1><a href="http://fedoraproject.org/">${_('Fedora')}</a></h1>
<!-- TODO: Make this do something useful, talk about interface :)
<div id="searchbox"> <div id="searchbox">
<form action="" method="get"> <form action="" method="get">
<label for="q">${_('Search:')}</label> <label for="q">${_('Search:')}</label>
@ -26,6 +27,7 @@
<input type="submit" value="${_('Search')}" /> <input type="submit" value="${_('Search')}" />
</form> </form>
</div> </div>
-->
</div> </div>
<div id="topnav"> <div id="topnav">
<ul> <ul>

3
fas/fas/user.py
View file

@ -512,6 +512,9 @@ https://admin.fedoraproject.org/accounts/user/verifypass/%(user)s/%(token)s
# full of random keys (keep a clean Fedora keyring) # full of random keys (keep a clean Fedora keyring)
# TODO: MIME stuff? # TODO: MIME stuff?
keyid = re.sub('\s', '', person.gpg_keyid) keyid = re.sub('\s', '', person.gpg_keyid)
if not keyid:
turbogears.flash(_("This user does not have a GPG Key ID set, so an encrypted email cannot be sent."))
return dict()
ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid]) ret = subprocess.call([config.get('gpgexec'), '--keyserver', config.get('gpg_keyserver'), '--recv-keys', keyid])
if ret != 0: if ret != 0:
turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net")) turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))