fix botched called to glue.conf()

svn path=/rpkid/rpki/gui/app/glue.py; revision=3650

2 files changed, 9 insertions, 11 deletions

diff --git a/rpkid/rpki/gui/app/glue.py b/rpkid/rpki/gui/app/glue.py
index 0204ff9e..25a06c1d 100644
--- a/rpkid/rpki/gui/app/glue.py
+++ b/rpkid/rpki/gui/app/glue.py
@@ -52,7 +52,7 @@ def conf(handle):
 
 def invoke_rpki(handle, args):
     """Invoke the myrpki cli for the specified configuration."""
-    myrpki_dir = confdir(handle)
+    myrpki_dir = conf(handle)
     config = myrpki_dir + '/rpki.conf'
     # default rpki.conf uses relative paths, so chdir() to the repo first
     cmd = 'cd %s && %s %s' % (settings.MYRPKI, myrpki_dir, ' '.join(['--config=' + config] + args))
diff --git a/rpkid/rpki/gui/app/views.py b/rpkid/rpki/gui/app/views.py
index 6929ab36..b0acf0fa 100644
--- a/rpkid/rpki/gui/app/views.py
+++ b/rpkid/rpki/gui/app/views.py
@@ -541,16 +541,14 @@ def upload_myrpki_xml(request, self_handle):
     conf = handle_or_404(request, self_handle)
 
     if request.method == 'POST':
-	try:
-            fname = '%s/%s/myrpki.xml' % (settings.MYRPKI_DATA_DIR, self_handle,)
-            print >>sys.stderr, 'writing ', fname
-            myrpki_xml = open(fname, 'w')
-            myrpki_xml.write(request.raw_post_data)
-            myrpki_xml.close()
-
-            glue.configure_daemons(conf.host)
-	except:
-            print >>sys.stderr, ''.join(sys.exc_info())
+        fname = glue.conf(self_handle) + '/myrpki.xml'
+        print >>sys.stderr, 'writing ', fname
+
+        myrpki_xml = open(fname, 'w')
+        myrpki_xml.write(request.raw_post_data)
+        myrpki_xml.close()
+
+        glue.configure_daemons(conf.host)
 
     return serve_file(self_handle, 'myrpki.xml', 'application/xml')