[Bps-public-commit] Prophet branch, master, updated. 15511112871705999a86f095b3cdd1d4722f6585

[jesse]

The branch, master has been updated
       via  15511112871705999a86f095b3cdd1d4722f6585 (commit)
       via  dac4288321ffe1694d1485de57f2afb615987e99 (commit)
      from  ff2d8453e6eb12fcc680871387aa190964d582ab (commit)

Summary of changes:
 Makefile.PL                      |    1 -
 lib/Prophet/CLI/Command/Merge.pm |    2 +-
 lib/Prophet/ChangeSet.pm         |    2 +-
 lib/Prophet/Replica/sqlite.pm    |    2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

- Log -----------------------------------------------------------------
commit dac4288321ffe1694d1485de57f2afb615987e99
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sun May 24 00:00:12 2009 -0400

    Remove Digest::SHA1 usage that had crept back in (ruz++)

diff --git a/Makefile.PL b/Makefile.PL
index 1f7a601..51b6ad6 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -9,7 +9,6 @@ requires('Params::Validate');
 requires('IPC::Run3');
 requires('Data::UUID');
 requires('Digest::SHA');
-requires('Digest::SHA1');
 requires('LWP::UserAgent');     #  LWP::ConnCache too
 requires('URI');
 requires('HTTP::Date');
diff --git a/lib/Prophet/ChangeSet.pm b/lib/Prophet/ChangeSet.pm
index f4e800c..c3a710c 100644
--- a/lib/Prophet/ChangeSet.pm
+++ b/lib/Prophet/ChangeSet.pm
@@ -2,7 +2,7 @@ package Prophet::ChangeSet;
 use Any::Moose;
 use Prophet::Change;
 use Params::Validate;
-use Digest::SHA1 qw/sha1_hex/;
+use Digest::SHA qw/sha1_hex/;
 use JSON;
 
 has creator => (
diff --git a/lib/Prophet/Replica/sqlite.pm b/lib/Prophet/Replica/sqlite.pm
index 4d9c391..75cf90c 100644
--- a/lib/Prophet/Replica/sqlite.pm
+++ b/lib/Prophet/Replica/sqlite.pm
@@ -7,7 +7,7 @@ use Data::UUID;
 use File::Path;
 use Prophet::Util;
 use JSON;
-use Digest::SHA1 qw/sha1_hex/;
+use Digest::SHA qw/sha1_hex/;
 use DBI;
 
 has dbh => (

commit 15511112871705999a86f095b3cdd1d4722f6585
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Sun May 24 00:00:35 2009 -0400

    Quient down initial pulls due to an uninit warning

diff --git a/lib/Prophet/CLI/Command/Merge.pm b/lib/Prophet/CLI/Command/Merge.pm
index 6417ca8..3bd9f58 100644
--- a/lib/Prophet/CLI/Command/Merge.pm
+++ b/lib/Prophet/CLI/Command/Merge.pm
@@ -90,7 +90,7 @@ sub _do_merge {
 
     my $changesets = 0;
 
-    my $source_latest = $self->source->latest_sequence_no() ;
+    my $source_latest = $self->source->latest_sequence_no() ||0;
     my $source_last_seen = $self->target->last_changeset_from_source($self->source->uuid);
 
     if( $self->has_arg('verbose') ) {

-----------------------------------------------------------------------