Fix regular expression used by 'make update' to only look for 'I' and '?' at the start of svn info results and to check for spaces after 'I' instead of just after '?'.

Previously it was able to match 'I' anywhere in the filenames of the svn info results instead of just files that where ignored or unknown to svn. This would cause 'make update' to infinitely recurse if a file was modified with I anywhere in its name since svn info would return a Path pointing to the llvm root for those files.

llvm-svn: 185539
This commit is contained in:
Craig Topper 2013-07-03 14:48:37 +00:00
parent c7afcedd2c
commit 785d969b01

View File

@ -253,7 +253,7 @@ AWK = awk
# a given path. svnup() requires one argument: the root to search from. # a given path. svnup() requires one argument: the root to search from.
define SUB_SVN_DIRS define SUB_SVN_DIRS
svnup() { svnup() {
dirs=`svn status --no-ignore $$1 | awk '/I|\? / {print $$2}' | LC_ALL=C xargs svn info 2>/dev/null | awk '/^Path:\ / {print $$2}'`; dirs=`svn status --no-ignore $$1 | awk '/^(I|\?) / {print $$2}' | LC_ALL=C xargs svn info 2>/dev/null | awk '/^Path:\ / {print $$2}'`;
if [ "$$dirs" = "" ]; then if [ "$$dirs" = "" ]; then
return; return;
fi; fi;