Permalink
Browse files

merged changes 2.1 vs 2.2

+++ 2.2 +++
improved cryptic error message
  • Loading branch information...
racke committed Jan 29, 2003
1 parent dba2ebf commit d1bc0138c8e67ffc484b22c4ed6c3bae59de22f6
Showing with 7 additions and 3 deletions.
  1. +7 −3 dist/lib/UI/pages/admin/merge_meta.html
@@ -198,10 +198,14 @@
my $bdb = $Db{mv_metadata_asc};
my $mtab = q{__UI_META_TABLE__} || 'mv_metadata';
my $mdb = $Db{$mtab};
- if(! $bdb or ! $mdb) {
- return errmsg("Cannot merge metadata -- a table is missing.");
+ if(! $bdb) {
+ return errmsg("Cannot merge metadata -- table %s is missing.",
+ 'mv_metadata_asc');
+ }
+ if(! $mdb) {
+ return errmsg("Cannot merge metadata -- table %s is missing.",
+ $mtab);
}
-
my @base;
while( my ($k) = $bdb->each_record()) {
push @base, $k;

0 comments on commit d1bc013

Please sign in to comment.