diff options
| author | Rob Austein <sra@hactrn.net> | 2013-03-25 23:04:20 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2013-03-25 23:04:20 +0000 |
| commit | c33869628a1b06eff50f54e91fbfc8c9bedf2dcf (patch) | |
| tree | c3f9540c3aeaff9cbcfe37b0d877baec34dfc8dc /rcynic | |
| parent | 06f4f438d03b682c678101bb2c41b8632d9cf94b (diff) | |
Call rpkigui-rcynic script if it exists rather than trying to execute
its code directly, as the latter requires a lot of Django-related
setup that's way out of scope for the RP code. Fixes #490.
svn path=/trunk/; revision=5214
Diffstat (limited to 'rcynic')
| -rw-r--r-- | rcynic/Makefile.in | 1 | ||||
| -rw-r--r-- | rcynic/rcynic-cron.py | 8 |
2 files changed, 4 insertions, 5 deletions
diff --git a/rcynic/Makefile.in b/rcynic/Makefile.in index 0a11abd5..623855a3 100644 --- a/rcynic/Makefile.in +++ b/rcynic/Makefile.in @@ -88,6 +88,7 @@ COMPILE_PYTHON_CRON = \ AC_RCYNIC_USER='${RCYNIC_USER}' \ AC_RCYNIC_DIR='${RCYNIC_DIR}' \ AC_bindir='${bindir}' \ + AC_sbindir='${sbindir}' \ AC_sysconfdir='${sysconfdir}' \ AC_RCYNIC_HTML_DIR='${RCYNIC_HTML_DIR}' \ ${PYTHON} ${abs_top_srcdir}/buildtools/make-rcynic-script.py <$? >$@; \ diff --git a/rcynic/rcynic-cron.py b/rcynic/rcynic-cron.py index 6c49e955..bf1d99d6 100644 --- a/rcynic/rcynic-cron.py +++ b/rcynic/rcynic-cron.py @@ -111,8 +111,6 @@ run(os.path.join(ac_bindir, "rtr-origin"), os.path.join(ac_rcynic_dir, "data/authenticated"), cwd = os.path.join(ac_rcynic_dir, "rpki-rtr")) -try: - import rpki.gui.cacheview.util - rpki.gui.cacheview.util.import_rcynic_xml() -except ImportError: - pass +prog = os.path.join(ac_sbindir, "rpkigui-rcynic") +if os.path.exists(prog): + run(prog) |