Revision: 11684
http://xorp.svn.sourceforge.net/xorp/?rev=11684&view=rev
Author: bms_fbsd
Date: 2009-12-04 19:16:08 +0000 (Fri, 04 Dec 2009)
Log Message:
-----------
Wrap Mkdir() in a try..except block to workaround an issue with
SCons versions prior to the r20090223 checkpoint release.
Tested by: Ben Greear
Modified Paths:
--------------
trunk/xorp/SConstruct
Modified: trunk/xorp/SConstruct
===================================================================
--- trunk/xorp/SConstruct 2009-12-04 18:50:55 UTC (rev 11683)
+++ trunk/xorp/SConstruct 2009-12-04 19:16:08 UTC (rev 11684)
@@ -607,7 +607,11 @@
# $BUILDIR/lib will contain .so symlinks
#
xorp_alias_libdir = os.path.join(builddir, 'lib')
- Execute(Mkdir(xorp_alias_libdir))
+ # XXX workaround Mkdir() failure on EEXIST, SCons < 20090223.
+ try:
+ Execute(Mkdir(xorp_alias_libdir))
+ except:
+ pass
env['xorp_alias_libdir'] = xorp_alias_libdir
#
# Build a further alias for the benefit of entities which
@@ -616,9 +620,13 @@
# $BUILDIR/lib/xorp/lib will point to $BUILDIR/lib
#
xorp_alias_subdir = os.path.join(xorp_alias_libdir, 'xorp')
- Execute(Mkdir(xorp_alias_subdir))
#
+ # XXX workaround Mkdir() failure on EEXIST, SCons < 20090223.
xorp_module_alias_libdir = os.path.join(xorp_alias_subdir, 'lib')
+ try:
+ Execute(Mkdir(xorp_alias_subdir))
+ except:
+ pass
Execute(env.Symlink(xorp_alias_libdir, xorp_module_alias_libdir))
env['xorp_module_alias_libdir'] = xorp_module_alias_libdir
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Xorp-cvs mailing list
[email protected]
http://mailman.ICSI.Berkeley.EDU/mailman/listinfo/xorp-cvs
