From cfd455e4ccbb245efdd48b49985e1582d88cf890 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Thu, 13 Mar 2008 00:56:05 -0400
Subject: [PATCH] Handle case where user doesn't have gpg_keyid set.  Fixes
 ticket #25

---
 fas/fas/templates/master.html | 2 ++
 fas/fas/user.py               | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/fas/fas/templates/master.html b/fas/fas/templates/master.html
index 0b3d58f..4838960 100644
--- a/fas/fas/templates/master.html
+++ b/fas/fas/templates/master.html
@@ -19,6 +19,7 @@
     <div id="wrapper">
       <div id="head">
         <h1><a href="http://fedoraproject.org/">${_('Fedora')}</a></h1>
+        <!-- TODO: Make this do something useful, talk about interface :)
         <div id="searchbox">
           <form action="" method="get">
             <label for="q">${_('Search:')}</label>
@@ -26,6 +27,7 @@
             <input type="submit" value="${_('Search')}" />
           </form>
         </div>
+        -->
       </div>
       <div id="topnav">
         <ul>
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 8e7e75a..1bbc14b 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -512,6 +512,9 @@ https://admin.fedoraproject.org/accounts/user/verifypass/%(user)s/%(token)s
             # full of random keys (keep a clean Fedora keyring)
             # TODO: MIME stuff?
             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])
             if ret != 0:
                 turbogears.flash(_("Your key could not be retrieved from subkeys.pgp.net"))