[llvm] r185539 - 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 '?'.

Craig Topper craig.topper at gmail.com
Wed Jul 3 07:48:37 PDT 2013


Author: ctopper
Date: Wed Jul  3 09:48:37 2013
New Revision: 185539

URL: http://llvm.org/viewvc/llvm-project?rev=185539&view=rev
Log:
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.


Modified:
    llvm/trunk/Makefile

Modified: llvm/trunk/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/Makefile?rev=185539&r1=185538&r2=185539&view=diff
==============================================================================
--- llvm/trunk/Makefile (original)
+++ llvm/trunk/Makefile Wed Jul  3 09:48:37 2013
@@ -253,7 +253,7 @@ AWK = awk
 # a given path. svnup() requires one argument: the root to search from.
 define SUB_SVN_DIRS
 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
     return;
   fi;





More information about the llvm-commits mailing list