From 1c6d5a8014793065532a717560b02f9af8e2c8ba Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sat, 26 Nov 2011 13:48:56 +0000
Subject: [PATCH] If $BUILDDIR is $SRCDIR/build and dup-src is used, don't copy
 "build"

Also, skip any '.git' directory.
---
 build.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/build.py b/build.py
index 0c8a694..2366514 100644
--- a/build.py
+++ b/build.py
@@ -582,9 +582,19 @@ def set_up_mappings(mappings):
 
 def dup_src(fn):
 	srcdir = os.environ['SRCDIR'] + '/'
+	builddir = os.environ['BUILDDIR']
+
+	build_in_src = srcdir + 'build' == builddir
+
 	for root, dirs, files in os.walk(srcdir):
 		assert root.startswith(srcdir)
 		reldir = root[len(srcdir):]
+
+		if reldir == '.git' or (reldir == 'build' and build_in_src):
+			print "dup-src: skipping", reldir
+			dirs[:] = []
+			continue
+
 		for f in files:
 			target = os.path.join(reldir, f)
 			#print "Copy %s -> %s" % (os.path.join(root, f), target)
-- 
2.11.4.GIT