From 4b65ea0ec0080baf901cb8349f1099afd6cc8210 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Tue, 11 Mar 2008 04:47:07 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ src/or/Makefile.am | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bd2d2be933..c4277dcfd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,8 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? Bugfix on 0.2.0.20-rc. - Generate "STATUS_SERVER" events rather than misspelled "STATUS_SEVER" events. Caught by mwenge; bugfix on 0.1.2.x. + - Fix the SVK version detection logic to work correctly on a branch. + Bugfix on 0.2.0.x. o Minor features: - Allow separate log levels to be configured for different logging 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 \