Author: jesse
Date: Fri Jul 18 19:12:08 2008
New Revision: 14297
Modified:
Prophet/trunk/lib/Prophet/Record.pm
Prophet/trunk/lib/Prophet/Replica.pm
Log:
* error output cleanup
Modified: Prophet/trunk/lib/Prophet/Record.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Record.pm (original)
+++ Prophet/trunk/lib/Prophet/Record.pm Fri Jul 18 19:12:08 2008
@@ -314,7 +314,7 @@
}
}
if (@errors) {
- die join( '', @errors );
+ die join( '', @errors )."\n";
}
return 1;
}
Modified: Prophet/trunk/lib/Prophet/Replica.pm
==============================================================================
--- Prophet/trunk/lib/Prophet/Replica.pm (original)
+++ Prophet/trunk/lib/Prophet/Replica.pm Fri Jul 18 19:12:08 2008
@@ -426,10 +426,12 @@
if ( $self->db_uuid && $args{for}->db_uuid && $self->db_uuid ne $args{for}->db_uuid ) {
if ($args{force}) {
- warn "You are merging two different databases! This is highly unusual.";
+ warn "WARNING: You are merging two different databases!\n";
}
else {
- confess "You are trying to merge two different databases! If you really want to do this, try adding a --force argument.\n"
+ die "You are trying to merge two different databases! This is NOT\n".
+ "recommended. If you really want to do this, add '--force' to\n".
+ "your commandline.\n\n"
. "Local database: " . $self->db_uuid . "\n"
. "Remote database: " . $args{for}->db_uuid . "\n";
}