diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-12 17:52:28 +0200 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2019-07-12 17:52:28 +0200 |
| commit | 81fada2b46636cbd118cc86ca85fa23966a4f88c (patch) | |
| tree | b7466cd11e81e45289ba0b36f5c73281f19e1112 /engine/SCons/Job.py | |
| parent | 2fb368b8751637ffa010e5e4f79e2dda6adc6038 (diff) | |
| parent | 7cff8ecb55b0eee07bf8c52ec5b3ea5c156bcbad (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'engine/SCons/Job.py')
| -rw-r--r-- | engine/SCons/Job.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/SCons/Job.py b/engine/SCons/Job.py index ed8a5e6..e049142 100644 --- a/engine/SCons/Job.py +++ b/engine/SCons/Job.py @@ -7,7 +7,7 @@ stop, and wait on jobs. """ # -# Copyright (c) 2001 - 2017 The SCons Foundation +# Copyright (c) 2001 - 2019 The SCons Foundation # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the @@ -29,7 +29,7 @@ stop, and wait on jobs. # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # -__revision__ = "src/engine/SCons/Job.py 74b2c53bc42290e911b334a6b44f187da698a668 2017/11/14 13:16:53 bdbaddog" +__revision__ = "src/engine/SCons/Job.py a56bbd8c09fb219ab8a9673330ffcd55279219d0 2019-03-26 23:16:31 bdeegan" import SCons.compat @@ -199,7 +199,7 @@ class Serial(object): task.prepare() if task.needs_execute(): task.execute() - except: + except Exception as e: if self.interrupted(): try: raise SCons.Errors.BuildError( |