diff options
| author | Steven Knight <knight@baldmt.com> | 2004-12-02 04:29:30 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2004-12-02 04:29:30 (GMT) |
| commit | 2fa621343311180c159ee09262cefe0ee0ad2d83 (patch) | |
| tree | 16de7183a1894d8d9e1dfe73cbcb354f472f5f85 /src/engine/SCons/Environment.py | |
| parent | 04f1a4d2dd431f169a7aed2ae740c8cbd09e8d50 (diff) | |
| download | SCons-2fa621343311180c159ee09262cefe0ee0ad2d83.zip SCons-2fa621343311180c159ee09262cefe0ee0ad2d83.tar.gz SCons-2fa621343311180c159ee09262cefe0ee0ad2d83.tar.bz2 | |
Scan SCons source code for uncaught KeyboardInterrupts. (Christoph Wiedemann)
Diffstat (limited to 'src/engine/SCons/Environment.py')
| -rw-r--r-- | src/engine/SCons/Environment.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py index 7de6307..ca543bd 100644 --- a/src/engine/SCons/Environment.py +++ b/src/engine/SCons/Environment.py @@ -836,7 +836,11 @@ class Base: continue try: target, depends = string.split(line, ':', 1) - except: + except (AttributeError, TypeError, ValueError): + # Python 1.5.2 throws TypeError if line isn't a string, + # Python 2.x throws AttributeError because it tries + # to call line.splite(). Either can throw ValueError + # if the line doesn't split into two or more elements. pass else: self.Depends(string.split(target), string.split(depends)) |