1berry/webmin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Delete code that includes the last perl module failure in error messages, as it generateds a lot of misleading failures due to missing but un-needed perl modules

Browse Source
This commit is contained in:
Jamie Cameron 2025-02-22 10:19:08 -08:00
parent 9580a661e6
commit 2697c12d88
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web-lib-funcs.pl
View File

@ -1768,22 +1768,13 @@ for(my $i=0; my @stack_ = caller($i); $i++) {
push(@stack, \@stack_);
}
my $err_caller;
my $err_last_eval = $gconfig{'error_stack'} ? $main::error_last_eval : "";
$err_last_eval =~ s/\n$// if ($err_last_eval);
$err_caller = "$stack[0]->[1] (line $stack[0]->[2])"
if ($stack[0]->[1] && $stack[0]->[2]);
if ($err_caller) {
$err_caller =~ s/$root_directory\///;
my $err_caller_msg_esc =
&quote_escape(($err_last_eval ? "$err_last_eval : $err_caller" : $err_caller), '"');
my $err_caller_msg_esc = &quote_escape($err_caller, '"');
my $err_caller_msg;
if ($err_last_eval && defined(&ui_details)) {
$err_caller_msg = &ui_details({
'title' => $text{'main_error_details'},
'content' => $err_caller_msg_esc,
'class' =>'error'}, 1);
}
elsif (defined(&ui_help)) {
if (defined(&ui_help)) {
$err_caller_msg = &ui_help($err_caller_msg_esc);
}
else {

7
web-lib.pl
View File

@ -34,12 +34,5 @@ if (!$done_web_lib_funcs) {
$remote_error_handler ||= \&error;
$main::remote_error_handler ||= \&error;
# Die handler that stores the error from
# eval message in a global variable
$SIG{__DIE__} = sub {
# Don't meddle with the natural functioning of eval.
$main::error_last_eval = $_[0] if (!$^S);
};
1;