Merged in techtonik/scons (pull request #308)

Improve a few docs and messages

2 files changed, 6 insertions, 6 deletions

diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py
index 286f230..94027ec 100644
--- a/src/engine/SCons/SConf.py
+++ b/src/engine/SCons/SConf.py
@@ -755,10 +755,10 @@ class CheckContext(object):
     A typical test is just a callable with an instance of CheckContext as
     first argument:
 
-    def CheckCustom(context, ...)
-    context.Message('Checking my weird test ... ')
-    ret = myWeirdTestFunction(...)
-    context.Result(ret)
+        def CheckCustom(context, ...):
+            context.Message('Checking my weird test ... ')
+            ret = myWeirdTestFunction(...)
+            context.Result(ret)
 
     Often, myWeirdTestFunction will be one of
     context.TryCompile/context.TryLink/context.TryRun. The results of
diff --git a/src/script/scons.py b/src/script/scons.py
index e522f57..1b9a824 100644
--- a/src/script/scons.py
+++ b/src/script/scons.py
@@ -188,8 +188,8 @@ sys.path = libs + sys.path
 if __name__ == "__main__":
     try:
         import SCons.Script
-    except:
-        print("Import failed. Unable to find SCons files in:")
+    except ImportError:
+        print("SCons import failed. Unable to find engine files in:")
         for path in libs:
             print("  %s" % path)
         raise