diff options
| author | Michael Elkins <melkins@tislabs.com> | 2010-07-08 16:45:31 +0000 |
|---|---|---|
| committer | Michael Elkins <melkins@tislabs.com> | 2010-07-08 16:45:31 +0000 |
| commit | d3abccfe65db789c32626dc1482dedcfb538c3b2 (patch) | |
| tree | 9c9d9318e77f9c17f7fb7ff79e51e9671b3ce8cc | |
| parent | 9d67afc3819ff737f3ad4be2a71983943a59c13e (diff) | |
call glue.configure_resources() after deleting a roa request from a prefix
use sys.executable to get the path to the python interpreter when invoking the myrpki.py cli
svn path=/portal-gui/rpkigui/myrpki/glue.py; revision=3367
| -rw-r--r-- | portal-gui/rpkigui/myrpki/glue.py | 4 | ||||
| -rw-r--r-- | portal-gui/rpkigui/myrpki/views.py | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/portal-gui/rpkigui/myrpki/glue.py b/portal-gui/rpkigui/myrpki/glue.py index bd234c26..a903b013 100644 --- a/portal-gui/rpkigui/myrpki/glue.py +++ b/portal-gui/rpkigui/myrpki/glue.py @@ -5,6 +5,7 @@ from __future__ import with_statement import os import os.path import csv +import sys from django.conf import settings from django.db.models import F @@ -33,7 +34,8 @@ def invoke_rpki(handle, args): config = settings.MYRPKI_DATA_DIR + '/' + handle + '/myrpki.conf' # default myrpki.conf uses relative paths, so chdir() to the repo first os.chdir(settings.MYRPKI_DATA_DIR + '/' + handle) - cmd = 'python ' + settings.MYRPKI_PATH + ' '.join(['--config=' + config] + args) + cmd = '%s %s %s' % (sys.executable, settings.MYRPKI_PATH, + ' '.join(['--config=' + config] + args)) print 'invoking', cmd os.system(cmd) diff --git a/portal-gui/rpkigui/myrpki/views.py b/portal-gui/rpkigui/myrpki/views.py index aa7ad014..a2a5a52a 100644 --- a/portal-gui/rpkigui/myrpki/views.py +++ b/portal-gui/rpkigui/myrpki/views.py @@ -404,6 +404,7 @@ def roa_request_delete_view(request, pk): if not roa.from_roa_request.all(): print 'removing empty roa for asn %d' % (roa.asn,) roa.delete() + glue.configure_resources(handle) return http.HttpResponseRedirect(prefix.get_absolute_url()) |