[oe-commits] Merten Sach : metadata_scm: Fix crash due to uncaught python exception

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 33bea949bae54ddc89aa83cf07d7b1ee62e2b393
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=33bea949bae54ddc89aa83cf07d7b1ee62e2b393

Author: Merten Sach <msach at mailbox.tu-berlin.de>
Date:   Sat Nov 22 22:54:55 2014 +0100

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.

Signed-off-by: Merten Sach <msach at mailbox.tu-berlin.de>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/metadata_scm.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index ba0edf9..237e618 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