[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  6fe7983 Match latest git's repo status messages.
      from  6ceb9ea Remove superfluous ${INSTALL_STRIP} uses.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 6fe798392bdbdeb34d01b15de7f0123df3bbe850
Author: Wayne Davison <wayned at samba.org>
Date:   Thu Jul 31 14:43:32 2014 -0700

    Match latest git's repo status messages.

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

Summary of changes:
 packaging/git-status.pl |    4 ++--
 packaging/nightly-rsync |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/packaging/git-status.pl b/packaging/git-status.pl
index 32cd437..9d322e6 100644
--- a/packaging/git-status.pl
+++ b/packaging/git-status.pl
@@ -35,8 +35,8 @@ sub check_git_status
     my($fatal_unless_clean, $subdir) = @_;
     $subdir = '.' unless defined $subdir;
     my $status = `cd '$subdir' && git status`;
-    my $is_clean = $status =~ /\nnothing to commit \(working directory clean\)/;
-    my($cur_branch) = $status =~ /^# On branch (.+)\n/;
+    my $is_clean = $status =~ /\nnothing to commit.+working directory clean/;
+    my($cur_branch) = $status =~ /^(?:# )?On branch (.+)\n/;
     if ($fatal_unless_clean && !$is_clean) {
 	if ($subdir eq '.') {
 	    $subdir = '';
diff --git a/packaging/nightly-rsync b/packaging/nightly-rsync
index 3aaabcb..c33a7da 100755
--- a/packaging/nightly-rsync
+++ b/packaging/nightly-rsync
@@ -39,7 +39,7 @@ if ($make_tar) {
     open(IN, '-|', 'git status') or die $!;
     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 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/;
     system "make $gen_target" and die "make $gen_target failed!\n";
 


-- 
The rsync repository.