Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merged changes 2.1 vs 2.2

+++ 2.2 +++
improved cryptic error message
  • Loading branch information...
commit d1bc0138c8e67ffc484b22c4ed6c3bae59de22f6 1 parent dba2ebf
@racke racke authored
Showing with 7 additions and 3 deletions.
  1. +7 −3 dist/lib/UI/pages/admin/merge_meta.html
View
10 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;
Please sign in to comment.
Something went wrong with that request. Please try again.