diff options
| author | Michael Elkins <melkins@tislabs.com> | 2012-11-26 03:49:18 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2012-11-26 03:49:18 +0000 |
| commit | 944d9b4a446c1401268d7ef8efb40b923177be95 (patch) | |
| tree | 845333bd85b4826d780d3207202b43305901c873 /rpkid/portal-gui/scripts | |
| parent | 6b24f45e97061a7bafa9af1a7efd21311892bcc4 (diff) | |
rewrite ghostbuster_{create,edit} not to use generic views
make sure to set the .vcard field when saving a ghostbuster request
display the list of covering ROAs from the rcynic cache in the route detail view
rename route_roa_list to route_detail
remove the delete button from the object_detail.html template since not all objects that use it can be deleted
set STATIC_ROOT in settings.py so that collectstatic works
svn path=/branches/tk329/; revision=4901
Diffstat (limited to 'rpkid/portal-gui/scripts')
| -rw-r--r-- | rpkid/portal-gui/scripts/rpki-manage.in | 2 | ||||
| -rw-r--r-- | rpkid/portal-gui/scripts/rpkigui-rcynic.py | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/rpkid/portal-gui/scripts/rpki-manage.in b/rpkid/portal-gui/scripts/rpki-manage.in index f9786898..fdd3ee3f 100644 --- a/rpkid/portal-gui/scripts/rpki-manage.in +++ b/rpkid/portal-gui/scripts/rpki-manage.in @@ -4,7 +4,7 @@ # $LANG is unset if [ -z "$LANG" ]; then echo '$LANG is unset, default to en_US.UTF-8' - exort LANG=en_US.UTF-8 + export LANG=en_US.UTF-8 fi export PYTHONPATH=@PYTHONPATH@${PYTHONPATH:+:}${PYTHONPATH} DJANGO_SETTINGS_MODULE=settings @DJANGO_ADMIN@ $* diff --git a/rpkid/portal-gui/scripts/rpkigui-rcynic.py b/rpkid/portal-gui/scripts/rpkigui-rcynic.py index 20973a0e..2e8e494f 100644 --- a/rpkid/portal-gui/scripts/rpkigui-rcynic.py +++ b/rpkid/portal-gui/scripts/rpkigui-rcynic.py @@ -1,5 +1,4 @@ # Copyright (C) 2011 SPARTA, Inc. dba Cobham -# Anaportal-gui/scripts/rpkigui-rcynic.py # Copyright (C) 2012 SPARTA, Inc. a Parsons Company # # Permission to use, copy, modify, and distribute this software for any @@ -175,7 +174,7 @@ def process_cache(root, xml_file): inst.mtime = mtime try: obj = vs.obj # causes object to be lazily loaded - except rpki.POW._der.DerError, e: + except Exception, e: logger.warning('Caught %s while processing %s: %s' % ( type(e), vs.filename, e)) continue |