diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-07-04 07:50:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-04 07:50:59 +0200 |
| commit | f1ff102fe5102f696e3339bd1667104844302c91 (patch) | |
| tree | a7b55af5f2b7598428590e1e2a9766905bb101cd | |
| parent | 1a941008f9950d352be9f673066e45375cf0bd43 (diff) | |
| parent | 67e53cb940924693c9a80ff86c968e6fdca441d2 (diff) | |
| download | vyatta-cfg-f1ff102fe5102f696e3339bd1667104844302c91.tar.gz vyatta-cfg-f1ff102fe5102f696e3339bd1667104844302c91.zip | |
Merge pull request #86 from vyos/mergify/bp/circinus/pr-85
T6527: remove remaining references to Perl (backport #85)
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | src/cstore/cstore.cpp | 15 |
2 files changed, 3 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index 073ee3a..2170f95 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,6 @@ src_libvyatta_cfg_la_LIBADD += -lgobject-2.0 src_libvyatta_cfg_la_LIBADD += -lboost_system src_libvyatta_cfg_la_LIBADD += -lboost_filesystem src_libvyatta_cfg_la_LIBADD += -lapt-pkg -src_libvyatta_cfg_la_LIBADD += -lperl src_libvyatta_cfg_la_LDFLAGS = -version-info 1:0:0 src_libvyatta_cfg_la_SOURCES = src/cli_parse.y src/cli_def.l src/cli_val.l src_libvyatta_cfg_la_SOURCES += src/cli_new.c src/cli_path_utils.c diff --git a/src/cstore/cstore.cpp b/src/cstore/cstore.cpp index c7870a2..bc6aa4d 100644 --- a/src/cstore/cstore.cpp +++ b/src/cstore/cstore.cpp @@ -3155,18 +3155,9 @@ Cstore::vexit_internal(const char *fmt, va_list alist) vsnprintf(buf, 256, fmt, alist); output_internal("%s\n", buf); fprintf(stderr, "DEBUG vexit_internal: %s\n", buf); // DEBUG - if (Perl_get_context()) { - /* we're in a perl context. do a croak to provide more information. - * note that the message should not end in "\n", or the croak message - * will be truncated for some reason. - */ - Perl_croak_nocontext("%s", buf); - // does not return - } else { - // output error message and exit - output_user_err("%s\n", buf); - exit(1); - } + // output error message and exit + output_user_err("%s\n", buf); + exit(1); } } // end namespace cstore |