merge with /trunk

svn path=/branches/tk274/; revision=4866

3 files changed, 26 insertions, 16 deletions

diff --git a/rpkid/portal-gui/rpki.wsgi.in b/rpkid/portal-gui/rpki.wsgi.in
index eb49fe05..3d198349 100644
--- a/rpkid/portal-gui/rpki.wsgi.in
+++ b/rpkid/portal-gui/rpki.wsgi.in
@@ -25,16 +25,22 @@ import sys
 
 old_sys_path = list(sys.path)
 
+def walk_error(e):
+    'This function is invoked when os.walk() needs to report an error'
+    print >>sys.stderr, 'error reading %s: %s' % (e.filename, e)
+
 # When used with virtualenv, specify the location of the python modules to use
 if VIRTUAL_ENV:
-    import site
+    d = os.path.join(VIRTUAL_ENV, 'lib')
     # locate the site-packages directory
-    for (dp, dn, fn) in os.walk(VIRTUAL_ENV + '/lib'):
+    for dp, dn, fn in os.walk(os.path.join(VIRTUAL_ENV, 'lib'),
+                              onerror=walk_error):
         if 'site-packages' in dn:
-            site.addsitedir(os.path.join(dp, 'site-packages'))
+            d = os.path.join(dp, 'site-packages')
+            import site
+            site.addsitedir(d)
             break
 
-import sys
 os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
 sys.path.insert(1, '@PYTHONPATH@')
 
@@ -48,6 +54,8 @@ for elt in list(sys.path):
         sys.path.remove(elt)
 sys.path[:0] = new_sys_path
 
+print >>sys.stderr, sys.path
+
 import django.core.handlers.wsgi
 application = django.core.handlers.wsgi.WSGIHandler()
 
diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
index 439a091a..b7f6c661 100644
--- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py
+++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py
@@ -98,7 +98,6 @@ def rcynic_roa(roa, obj):
 
 def rcynic_gbr(gbr, obj):
     vcard = vobject.readOne(gbr.vcard)
-    logger.debug(vcard.prettyPrint())
     obj.full_name = vcard.fn.value if hasattr(vcard, 'fn') else None
     obj.email_address = vcard.email.value if hasattr(vcard, 'email') else None
     obj.telephone = vcard.tel.value if hasattr(vcard, 'tel') else None
@@ -123,21 +122,21 @@ def save_statuses(inst, statuses):
     # if this object is in our interest set, update with the current validation
     # status
     if inst.uri in uris:
-        x, y, z, q = uris[inst.repo.uri]
+        x, y, z, q = uris[inst.uri]
         uris[inst.uri] = x, y, valid, inst
 
 
 @transaction.commit_on_success
 def process_cache(root, xml_file):
     dispatch = {
-      'rcynic_certificate': rcynic_cert,
-      'rcynic_roa': rcynic_roa,
-      'rcynic_ghostbuster': rcynic_gbr
+        'rcynic_certificate': rcynic_cert,
+        'rcynic_roa': rcynic_roa,
+        'rcynic_ghostbuster': rcynic_gbr
     }
     model_class = {
-      'rcynic_certificate': models.Cert,
-      'rcynic_roa': models.ROA,
-      'rcynic_ghostbuster': models.Ghostbuster
+        'rcynic_certificate': models.Cert,
+        'rcynic_roa': models.ROA,
+        'rcynic_ghostbuster': models.Ghostbuster
     }
 
     last_uri = None
@@ -176,7 +175,8 @@ def process_cache(root, xml_file):
                 try:
                     obj = vs.obj  # causes object to be lazily loaded
                 except rpki.POW._der.DerError, e:
-                    logger.warning('Caught %s while processing %s: %s' % (type(e), vs.filename, e))
+                    logger.warning('Caught %s while processing %s: %s' % (
+                        type(e), vs.filename, e))
                     continue
 
                 inst.not_before = obj.notBefore.to_sql()
@@ -283,9 +283,9 @@ def fetch_published_objects():
             qs = models.RepositoryObject.objects.filter(uri=pdu.uri)
             if qs:
                 # get the current validity state
-                valid = obj.statuses.filter(status=object_accepted).exists()
+                valid = qs[0].statuses.filter(status=object_accepted).exists()
                 uris[pdu.uri] = (pdu.self_handle, valid, False, None)
-                logger.debug('adding ' + ', '.join(uris[pdu.uri]))
+                logger.debug('adding ' + pdu.uri)
             else:
                 # this object is not in the cache.  it was either published
                 # recently, or disappared previously.  if it disappeared
@@ -394,6 +394,7 @@ if __name__ == '__main__':
     start = time.time()
     process_labels(options.logfile)
     object_accepted = LABEL_CACHE['object_accepted']
+    fetch_published_objects()
     process_cache(options.root, options.logfile)
     notify_invalid()
 
diff --git a/rpkid/portal-gui/settings.py.in b/rpkid/portal-gui/settings.py.in
index 10705ef8..46f6ca60 100644
--- a/rpkid/portal-gui/settings.py.in
+++ b/rpkid/portal-gui/settings.py.in
@@ -86,12 +86,13 @@ INSTALLED_APPS = (
     #'django.contrib.admin',
     #'django.contrib.admindocs',
     'django.contrib.contenttypes',
+    'django.contrib.formtools',
     'django.contrib.sessions',
     'rpki.irdb',
     'rpki.gui.app',
     'rpki.gui.cacheview',
     'rpki.gui.routeview',
-    'south'
+    'south',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (