Skip to content

Commit

Permalink
Merge pull request #85 from jestabro/remove-perl
Browse files Browse the repository at this point in the history
T6527: remove remaining references to Perl
  • Loading branch information
c-po authored Jul 3, 2024
2 parents b8bdc8a + d509db1 commit 929667c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
1 change: 0 additions & 1 deletion Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 3 additions & 12 deletions src/cstore/cstore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 929667c

Please sign in to comment.