[Bps-public-commit] brackup branch, master, updated. 46ed50e51fe0ece61e30b79d68d11fa073388f10

[Alex Vandiver]

The branch, master has been updated
       via  46ed50e51fe0ece61e30b79d68d11fa073388f10 (commit)
       via  cceedaeea7360f16fb8b9105cda51b59a0dbc2cc (commit)
       via  351b868d910fff6582e6c1cf62363364c805c4d8 (commit)
       via  74f8f7b6921ba0540e8b28f5e3e6e6a72c8720ba (commit)
      from  59f0918d7512192b8e76653b9136974f0a7182b4 (commit)

Summary of changes:
 Makefile.PL           |    2 ++
 lib/Brackup/Backup.pm |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

- Log -----------------------------------------------------------------
commit 74f8f7b6921ba0540e8b28f5e3e6e6a72c8720ba
Author: gavin at openfusion.com.au <gavin at openfusion.com.au@c3152786-d43a-0410-8499-09eb43983aed>
Date:   Thu May 27 13:30:25 2010 +0000

    Add new test keyrings to MANIFEST.
    
    git-svn-id: http://brackup.googlecode.com/svn/trunk@311 c3152786-d43a-0410-8499-09eb43983aed

diff --git a/MANIFEST b/MANIFEST
index 5034cc7..c58ee91 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -73,8 +73,10 @@ t/data-2/my-link.txt
 t/data-2/my_dir/sub_dir/another-file.txt
 t/data-2/my_dir/sub_dir/program.sh
 t/data-2/pubring-test.gpg
+t/data-2/pubring-test2.gpg
 t/data-2/README
 t/data-2/secring-test.gpg
+t/data-2/secring-test2.gpg
 t/data-2/test-file.txt
 t/data-weird-filenames/000-dup1.txt
 t/data-weird-filenames/000-dup2.txt
@@ -93,7 +95,9 @@ t/data/my-link.txt
 t/data/my_dir/sub_dir/another-file.txt
 t/data/my_dir/sub_dir/program.sh
 t/data/pubring-test.gpg
+t/data/pubring-test2.gpg
 t/data/secring-test.gpg
+t/data/secring-test2.gpg
 t/data/test-file.txt
 t/misc/brackup.conf
 TODO

commit 351b868d910fff6582e6c1cf62363364c805c4d8
Author: gavin at openfusion.com.au <gavin at openfusion.com.au@c3152786-d43a-0410-8499-09eb43983aed>
Date:   Thu May 27 14:46:02 2010 +0000

    Tweak warning message if GTop not available (Alex Vandiver).
    
    git-svn-id: http://brackup.googlecode.com/svn/trunk@312 c3152786-d43a-0410-8499-09eb43983aed

diff --git a/lib/Brackup/BackupStats.pm b/lib/Brackup/BackupStats.pm
index ee0ad81..d9d0371 100644
--- a/lib/Brackup/BackupStats.pm
+++ b/lib/Brackup/BackupStats.pm
@@ -17,9 +17,6 @@ sub new {
         $self->{gtop_max} = 0;
         $self->{gtop_data} = Brackup::BackupStats::Data->new;
     }
-    else {
-        warn "GTop not found - skipping gtop stats\n";
-    }
 
     return bless $self, $class;
 }
@@ -66,6 +63,9 @@ sub print {
         printf $fh $fmt, 
             'Peak Memory Usage:', sprintf('%0.1f MB', $self->{gtop_max} / (1024 * 1024));
         print $fh "${hash}\n";
+    } else {
+        print $fh "${hash}GTop not installed, memory usage stats disabled\n";
+        print $fh "${hash}\n";
     }
 
     my $data = $self->{data};

commit cceedaeea7360f16fb8b9105cda51b59a0dbc2cc
Author: gavin at openfusion.com.au <gavin at openfusion.com.au@c3152786-d43a-0410-8499-09eb43983aed>
Date:   Thu May 27 15:01:09 2010 +0000

    Add .brackup-digest.db-journal to backup ignore list (Alex Vandiver).
    
    git-svn-id: http://brackup.googlecode.com/svn/trunk@313 c3152786-d43a-0410-8499-09eb43983aed

diff --git a/lib/Brackup/Root.pm b/lib/Brackup/Root.pm
index ddec6be..642a2de 100644
--- a/lib/Brackup/Root.pm
+++ b/lib/Brackup/Root.pm
@@ -130,7 +130,7 @@ sub foreach_file {
                 foreach my $pattern (@{ $self->{ignore} }) {
                     next DENTRY if $path =~ /$pattern/;
                     next DENTRY if $is_dir && "$path/" =~ /$pattern/;
-                    next DENTRY if $path =~ m!(^|/)\.brackup-digest\.db$!;
+                    next DENTRY if $path =~ m!(^|/)\.brackup-digest\.db(-journal)?$!;
                 }
 
                 $statcache{$path} = $statobj;

commit 46ed50e51fe0ece61e30b79d68d11fa073388f10
Merge: 59f0918 cceedae
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Thu May 27 11:03:33 2010 -0400

    Merge remote branch 'trunk'


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