[svn-r26349] Merges r26348 from trunk

Updates bin/chkmanifest to correctly handle the seven Subversion status
columns that are output by svn stat.

Previously, the script assumed that they would all be blank for newly-
added files. This is not always true when merging.

Part of: HDFFV-8895

Tested on: jam (bin/chkmanifest only)

1 files changed, 6 insertions, 3 deletions

diff --git a/bin/chkmanifest b/bin/chkmanifest
index 6188eab..8abd8ea 100755
--- a/bin/chkmanifest
+++ b/bin/chkmanifest
@@ -86,15 +86,18 @@ for file in $svn_stat; do
     # The line listing them starts with 'A'.
     letter="$(echo $file | head -c 1)"
     if [ "$letter" = "A" ]; then
-        # Convert 'A     ' to './' so it matches
+        # Convert the seven Subversion status columns to './' so it matches
         # the manifest file name.
-        path=`echo $file | sed 's/^A\s*/\.\//g'`
+        #
+        # There is a space between the status columns and file name, hence
+        # the '8' instead of '7'.
+        path=`echo $file | sed 's/^.\{8\}/\.\//g'`
         # Ignore directories
         if [ ! -d $path ]; then
             if (grep ^$path$ $MANIFEST >/dev/null); then
                 :
             else
-                echo "+ $path"
+                echo "- $path"
                 fail=yes
             fi
         fi