diff options
| author |   Merten Sach <msach@mailbox.tu-berlin.de> | 2014-11-22 22:54:55 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:34 +0000 |
| commit | 4a3f37f7d004b196b9caeb558d3461452dd85edc (patch) | |
| tree | f5763b1b43685bc888575527d76c7241e963ae58 | |
| parent | b143340700961f916e4a21da42b859ec014dd366 (diff) | |
| download | openembedded-core-contrib-4a3f37f7d004b196b9caeb558d3461452dd85edc.tar.gz | |
metadata_scm: Fix crash due to uncaught python exception
Function base_get_metadata_svn_revision was crashing due to an uncaught
IndexError exception.
The except notation without parentheses is legacy syntax. It is the equivalent
to 'except IOError as IndexError' which is not what we want here.
The change catches both exceptions.
(From OE-Core rev: 33bea949bae54ddc89aa83cf07d7b1ee62e2b393)
Signed-off-by: Merten Sach <msach@mailbox.tu-berlin.de>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/classes/metadata_scm.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass index ba0edf9486..237e61821d 100644 --- a/meta/classes/metadata_scm.bbclass +++ b/meta/classes/metadata_scm.bbclass @@ -60,7 +60,7 @@ def base_get_metadata_svn_revision(path, d): try: with open("%s/.svn/entries" % path) as f: revision = f.readlines()[3].strip() - except IOError, IndexError: + except (IOError, IndexError): pass return revision |