From fec6ea6ae2f63c3aea474ba7a90d8e9f8e80c503 Mon Sep 17 00:00:00 2001 From: Andrey Hippo Date: Tue, 18 Nov 2008 14:05:47 +0000 Subject: [PATCH] Bug 387: Build fails with junk subdirectories in "scratch" directory --- wscript | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript index 6b2c0935c..e3276b0b0 100644 --- a/wscript +++ b/wscript @@ -315,6 +315,8 @@ def create_ns3_program(bld, name, dependencies=('simulator',)): def add_scratch_programs(bld): all_modules = [mod[len("ns3-"):] for mod in bld.env()['NS3_MODULES']] for filename in os.listdir("scratch"): + if filename.startswith('.') or filename == 'CVS': + continue if os.path.isdir(os.path.join("scratch", filename)): obj = bld.create_ns3_program(filename, all_modules) obj.path = obj.path.find_dir('scratch') @@ -622,7 +624,7 @@ def copytree(src, dst, symlinks=False, excludes=(), build_dir=None): elif os.path.isdir(srcname): if name in excludes: continue - elif name.startswith('.') or name.startswith(',,') or name.startswith('++'): + elif name.startswith('.') or name.startswith(',,') or name.startswith('++') or name.startswith('CVS'): continue elif name == build_dir: continue