diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-03-11 04:47:07 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-03-11 04:47:07 +0000 |
| commit | 4b65ea0ec0080baf901cb8349f1099afd6cc8210 (patch) | |
| tree | d8da8cb757ae164d03e96b5f1124b3fabe897367 /src/or/Makefile.am | |
| parent | 8b24e01599f2838ace5a0995acf575711f067f1c (diff) | |
| download | tor-4b65ea0ec0080baf901cb8349f1099afd6cc8210.tar.gz tor-4b65ea0ec0080baf901cb8349f1099afd6cc8210.zip | |
r18730@catbus: nickm | 2008-03-11 00:47:04 -0400
Forward-port: Fix the SVK version detection logic to work right on a branch: tolerate multiple "copied from" tags and only look at the first.
svn:r13959
Diffstat (limited to 'src/or/Makefile.am')
| -rw-r--r-- | src/or/Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/Makefile.am b/src/or/Makefile.am index 9efe220636..9654eab04d 100644 --- a/src/or/Makefile.am +++ b/src/or/Makefile.am @@ -74,7 +74,8 @@ micro-revision.i: FORCE break; \ else \ loc=`svk info $$location | \ - sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p'`; \ + sed -n 's/^Copied From: \(.*\), Rev\. [0-9][0-9]*/\1/p' | \ + head -1`; \ if test x$$loc = x; then \ break; \ else \ |