From 39c91458b2092a81a8bdba2ea9b73cf7f9b77317 Mon Sep 17 00:00:00 2001 From: Travis Geiselbrecht Date: Sat, 19 Sep 2009 20:19:50 +0000 Subject: [PATCH] Fix the CopySetHaikuRevision1 rule if you're building in a plain git repository, not mirroed via git-svn. Calling git-svn on a plain repository seems to cause it to go haywire. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33192 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/FileRules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/jam/FileRules b/build/jam/FileRules index 84e75b686a..69031c3359 100644 --- a/build/jam/FileRules +++ b/build/jam/FileRules @@ -319,7 +319,7 @@ actions CopySetHaikuRevision1 # Try svn or git-svn # Extract from "Revision: 12345" line revision=`(LC_ALL=C LANG=C svn info $(HAIKU_TOP) || - (cd $(HAIKU_TOP) && LC_ALL=C LANG=C git svn info)) 2> /dev/null | + (cd $(HAIKU_TOP) && [ -d .git/svn ] && LC_ALL=C LANG=C git svn info)) 2> /dev/null | grep Revision | awk '{printf $2}'` if [ "$revision" = 0 -o "$revision" = "" ]; then # git-svn not present or not configured for this repository