Check server status before we check the contents of the feed

By checking the contents first, we'd get an exception before
we got to the status check, and thus generate an incorrect message

diff --git a/hamnadmin/register/views.py b/hamnadmin/register/views.py
index 6ad42e0ad8dac01cf99ce35932892187fc45f81d..1c00e507923c8b11d2446d5c25c83391a8ee14c3 100644 (file)
--- a/hamnadmin/register/views.py
+++ b/hamnadmin/register/views.py
@@ -70,6 +70,8 @@ def new(request):
        try:
                feed = feedparser.parse(feedurl)
                status = feed.status
+               if not status == 200:
+                       raise pExcept('Attempt to download blog feed returned status %s.' % (status))
                lnk = feed.feed.link
                l = len(feed.entries)
                if l < 1:
@@ -78,8 +80,6 @@ def new(request):
                raise
        except Exception, e:
                raise pExcept('Failed to download blog feed: %s' % e)
-       if not status == 200:
-               raise pExcept('Attempt to download blog feed returned status %s.' % (status))
        
        if not settings.NOTIFYADDR:
                raise pExcept('Notify address not specified, cannot complete')