third_party/scons/scons-local/SCons/Tool/__init__.py - Issue 17024: Update to SCons 1.2.0.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/scons/scons-local/SCons/Tool/init.py

Issue 17024: Update to SCons 1.2.0. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 12 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/scons/scons-local/SCons/Tool/__init__.py

===================================================================

--- third_party/scons/scons-local/SCons/Tool/__init__.py (revision 7505)

+++ third_party/scons/scons-local/SCons/Tool/__init__.py (working copy)

@@ -36,7 +36,7 @@

# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-__revision__ = "src/engine/SCons/Tool/__init__.py 3603 2008/10/10 05:46:45 scons"

+__revision__ = "src/engine/SCons/Tool/__init__.py 3842 2008/12/20 22:59:52 scons"

import imp

import sys

@@ -142,7 +142,7 @@

file.close()

return module

except ImportError, e:

- if e!="No module named %s"%self.name:

+ if str(e)!="No module named %s"%self.name:

raise SCons.Errors.EnvironmentError, e

try:

import zipimport