From 07171ee985b69d0a700c6de5a10bac222af74955 Mon Sep 17 00:00:00 2001 From: Greg Sabino Mullane Date: Tue, 17 Jun 2014 09:15:37 -0400 Subject: [PATCH] Clean up wording on add_sync --- bucardo | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bucardo b/bucardo index 3603a7727..c788c9fb5 100755 --- a/bucardo +++ b/bucardo @@ -4290,7 +4290,7 @@ sub add_sync { my $found = keys %{ $result->{match} }; for my $name (sort keys %{ $result->{new} }) { - push @message => qq{ Table added: "$name"}; + push @message => qq{ Added table "$name"}; } ## If a specific table is not found, throw an exception @@ -4314,7 +4314,7 @@ sub add_sync { for my $rname (sort keys %$RELGROUP) { my $innerjoin = join ',' => sort keys %{$RELGROUP->{$rname}{goat}}; if ($innerjoin eq $newlist) { - push @message => qq{Using existing relgroup group "$rname"}; + push @message => qq{Using existing relgroup "$rname"}; $relgroup_name = $rname; last; } @@ -4340,7 +4340,7 @@ sub add_sync { ## Also associate our tables with this new group if (! exists $HERD->{ $relgroup_name }) { - push @message => qq{Created a new relgroup named "$relgroup_name"\n}; + unshift @message => qq{Created a new relgroup named "$relgroup_name"\n}; $SQL = 'INSERT INTO bucardo.herdmap(herd,goat) VALUES (?,?)'; $sth = $dbh->prepare($SQL); @@ -4383,14 +4383,14 @@ sub add_sync { die "Failed to add sync: $@\n"; } + $QUIET or print qq{Added sync "$sync_name"\n}; + ## Now we can output our success messages if any for my $msg (@message) { chomp $msg; $QUIET or print "$msg\n"; } - $QUIET or print qq{Added sync "$sync_name"\n}; - confirm_commit(); exit 0; @@ -8170,7 +8170,7 @@ sub message { $sth = $dbh->prepare($SQL); $sth->execute($nouns); $dbh->commit(); - $VERBOSE and print "Message added\n"; + $VERBOSE and print "Added message\n"; exit 0; -- 2.39.5