Remove an old comment from DirScanner.py. (Chad Austin) Update overlooked changes...

git-svn-id: http://scons.tigris.org/svn/scons/trunk@1320 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 545ef2ae8602d91298c2992d1b4fe392f9aeb48f..8d399462dae49e82a9bc9dc35bde66ff1425cfcf 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -32,6 +32,10 @@ RELEASE 0.97 - XXX
     files so the same signature file can interoperate on Windows and
     non-Windows systems.
 
+  - Make --debug=stacktrace print a stacktrace when a UserError is thrown.
+
+  - Remove an old, erroneous cut-and-paste comment in Scanner/Dir.py.
+
   From Stanislav Baranov:
 
   - Make it possible to support with custom Alias (sub-)classes.
@@ -63,6 +67,9 @@ RELEASE 0.97 - XXX
 
   - Fix an incorrect Command() keyword argument in the man page.
 
+  - Add a $TEMPFILEPREFIX variable to control the prefix or flag used
+    to pass a long-command-line-execution tempfile to a command.
+
   From Eric Frias:
 
   - Huge performance improvement:  wrap the tuples representing an

diff --git a/src/engine/SCons/Scanner/Dir.py b/src/engine/SCons/Scanner/Dir.py
index e89f12b22a7e1d10a230290e50ffc58dea1ca08a..7c39f26b399ed44c33fba8cac595ec261e39c81c 100644 (file)
--- a/src/engine/SCons/Scanner/Dir.py
+++ b/src/engine/SCons/Scanner/Dir.py
@@ -49,10 +49,7 @@ skip_entry = {
 
 def scan(node, env, path=()):
     """
-    This scanner scans program files for static-library
-    dependencies.  It will search the LIBPATH environment variable
-    for libraries specified in the LIBS variable, returning any
-    files it finds as dependencies.
+    This scanner scans a directory for on-disk files and directories therein.
     """
     try:
         flist = node.fs.listdir(node.abspath)