Make scons return a failure code when a Builder fails (Anthony Roach)

1 files changed, 7 insertions, 7 deletions

diff --git a/SConstruct b/SConstruct
index 5c09e43..74db668 100644
--- a/SConstruct
+++ b/SConstruct
@@ -47,12 +47,13 @@ Default('.')
 def whereis(file):
     for dir in string.split(os.environ['PATH'], os.pathsep):
         f = os.path.join(dir, file)
-	try:
-	    st = os.stat(f)
-	except:
-            continue
-        if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
-            return f
+        if os.path.isfile(f):
+            try:
+                st = os.stat(f)
+            except:
+                continue
+            if stat.S_IMODE(st[stat.ST_MODE]) & 0111:
+                return f
     return None
 
 #
@@ -356,7 +357,6 @@ for p in [ scons ]:
     # README.txt, or setup.py.  Make a copy of the list for the
     # destination files.
     #
-    global src_files
     src_files = map(lambda x: x[:-1],
                     open(os.path.join(src, 'MANIFEST.in')).readlines())
     dst_files = map(lambda x: os.path.join(install, x), src_files)