[interchange] Use $db->errstr instead of not necessarily set $@ to get error messages
Jon Jensen <[email protected]> Thu, 02 Nov 2017 05:53:55 +0000
| Newsgroups | gmane.comp.web.interchange.cvs |
|---|---|
| Message-ID | <[email protected]> |
commit 7881890bd70de9055b20ef5214425547c600538d Author: Jon Jensen <[email protected]> Date: Wed Nov 1 19:01:19 2017 -0600 Use $db->errstr instead of not necessarily set $@ to get error messages dist/lib/UI/pages/admin/pref_select.html | 2 +- dist/lib/UI/profiles/db_maintenance | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) --- diff --git a/dist/lib/UI/pages/admin/pref_select.html b/dist/lib/UI/pages/admin/pref_select.html index 2f85ff6..79b1fae 100644 --- a/dist/lib/UI/pages/admin/pref_select.html +++ b/dist/lib/UI/pages/admin/pref_select.html @@ -78,7 +78,7 @@ for(grep $_, @{$CGI_array->{item_id}}) { $db->delete_record($_) - or push @errors, $@; + or push @errors, $db->errstr; } if(@errors) { my $plural = @errors > 1 ? 's' : ''; diff --git a/dist/lib/UI/profiles/db_maintenance b/dist/lib/UI/profiles/db_maintenance index 65631ca..27111e5 100644 --- a/dist/lib/UI/profiles/db_maintenance +++ b/dist/lib/UI/profiles/db_maintenance @@ -143,7 +143,7 @@ __NAME__ db_maintenance push @out, errmsg("Deleted %s from %s", $key, $t); } else { - push @errors, errmsg("Unable to delete %s: %s", $key, $@); + push @errors, errmsg("Unable to delete %s: %s", $key, $db->errstr); } } else { @@ -151,10 +151,10 @@ __NAME__ db_maintenance #Debug("simple case regular key=$_"); my $rc = $db->delete_record($_); if($rc) { - push @out, errmsg("Deleted %s from %s", $_, $t); + push @out, errmsg("Deleted %s from %s", $_, $t); } else { - push @errors, errmsg("Unable to delete %s from %s: %s", $_, $t, $@); + push @errors, errmsg("Unable to delete %s from %s: %s", $_, $t, $db->errstr); } } } @@ -202,7 +202,7 @@ __NAME__ db_maintenance next unless $db->record_exists($key); $db->delete_record($key) or do { - push @errors, $@; + push @errors, $db->errstr; next; }; push @out, errmsg("Deleted %s from %s", $key, $t);