[SCM] The rsync repository. - branch master updated

Rsync CVS commit messages rsync-cvs at lists.samba.org
Thu Jul 31 15:53:08 MDT 2014


The branch, master has been updated
       via  f438d5a Match latest git's repo branch message.
      from  6fe7983 Match latest git's repo status messages.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f438d5abe08bb9164478111d3e5c11200abb2baf
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Jul 31 14:52:30 2014 -0700

    Match latest git's repo branch message.

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

Summary of changes:
 packaging/nightly-rsync |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index c33a7da..44e8558 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -40,7 +40,7 @@ if ($make_tar) {
     my $status = join('', <IN>);
     close IN;
     die "The checkout is not clean:\n", $status unless $status =~ /\nnothing to commit.+working directory clean/;
-    die "The checkout is not on the master branch.\n" unless $status =~ /^# On branch master\n/;
+    die "The checkout is not on the master branch.\n" unless $status =~ /^(?:# )?On branch master\n/;
     system "make $gen_target" and die "make $gen_target failed!\n";
 
     my @extra_files;


-- 
The rsync repository.


More information about the rsync-cvs mailing list