diff options
| author | William Deegan <bill@baddogconsulting.com> | 2010-05-09 21:45:03 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2010-05-09 21:45:03 (GMT) |
| commit | 03be8d4c4e101c18561486fc31f21aefffe42f4b (patch) | |
| tree | 0b0a777fca857101844806a41e7e29b7137d8cc7 /doc | |
| parent | 4ed1286615fbbe803ec4b228239436e3305ef2d4 (diff) | |
| download | SCons-03be8d4c4e101c18561486fc31f21aefffe42f4b.zip SCons-03be8d4c4e101c18561486fc31f21aefffe42f4b.tar.gz SCons-03be8d4c4e101c18561486fc31f21aefffe42f4b.tar.bz2 | |
Merged revisions 4832,4834-4836 via svnmerge from
http://scons.tigris.org/svn/scons/checkpoint/trunk
........
r4832 | bdbaddog | 2010-05-03 23:00:21 -0700 (Mon, 03 May 2010) | 3 lines
Updated RELEASE.txt from Greg Noel
........
r4834 | bdbaddog | 2010-05-03 23:34:14 -0700 (Mon, 03 May 2010) | 3 lines
Updates for 2.0.0.alpha.20100503 checkpoint release
........
r4835 | bdbaddog | 2010-05-08 14:27:43 -0700 (Sat, 08 May 2010) | 3 lines
Change test to check for version 3.0 and expect failure, since we're now working on a 2.0 checkpoint.
........
r4836 | bdbaddog | 2010-05-08 14:31:58 -0700 (Sat, 08 May 2010) | 3 lines
Update build date. Fix checkpoint build version string to remove the .dYYYYMMDD and change to .YYYYMMDD
........
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/user/troubleshoot.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/user/troubleshoot.xml b/doc/user/troubleshoot.xml index ffc37fc..26e6996 100644 --- a/doc/user/troubleshoot.xml +++ b/doc/user/troubleshoot.xml @@ -1122,10 +1122,10 @@ task.prepare() File "bootstrap/src/engine/SCons/Script/Main.py", line 167, in prepare return SCons.Taskmaster.OutOfDateTask.prepare(self) - File "bootstrap/src/engine/SCons/Taskmaster.py", line 190, in prepare + File "bootstrap/src/engine/SCons/Taskmaster.py", line 187, in prepare executor.prepare() - File "bootstrap/src/engine/SCons/Executor.py", line 397, in prepare - raise SCons.Errors.StopError, msg % (s, self.batches[0].targets[0]) + File "bootstrap/src/engine/SCons/Executor.py", line 392, in prepare + raise SCons.Errors.StopError(msg % (s, self.batches[0].targets[0])) </screen> <para> |