[Boost-commit] svn:boost r38973 - trunk/tools/build/v2/test

From: grafikrobot_at_[hidden]
Date: 2007-08-26 15:24:13

Author: grafik
Date: 2007-08-26 15:24:13 EDT (Sun, 26 Aug 2007)
New Revision: 38973
URL: http://svn.boost.org/trac/boost/changeset/38973

Log:
Make rm try the glob_file in addition to regular glob. Clears alternatives and project_glob failures on windows.
Text files modified: 
   trunk/tools/build/v2/test/BoostBuild.py |     8 ++++++--                                
   1 files changed, 6 insertions(+), 2 deletions(-)

Modified: trunk/tools/build/v2/test/BoostBuild.py
==============================================================================
--- trunk/tools/build/v2/test/BoostBuild.py	(original)
+++ trunk/tools/build/v2/test/BoostBuild.py	2007-08-26 15:24:13 EDT (Sun, 26 Aug 2007)
@@ -289,8 +289,10 @@
         for name in names:
             n = self.native_file_name(name)
             n = glob.glob(n)
+            if n: n = n[0]
+            if not n:
+                n = self.glob_file(string.replace(name, "$toolset", self.toolset+"*"))
             if n:
-                n = n[0]
                 if os.path.isdir(n):
                     shutil.rmtree(n, ignore_errors=0)
                 else:
@@ -411,7 +413,9 @@
                     result = self.native_file_name(f)
                     break
         if not result:
-            result = glob.glob(self.native_file_name(name))[0]
+            result = glob.glob(self.native_file_name(name))
+            if result:
+                result = result[0]
         return result
 
     def read(self, name):