diff options
author | Alejandro Mery <amery@hanoverdisplays.com> | 2017-03-01 14:19:08 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-03-07 13:30:26 +0100 |
commit | b17bbbe2245f72144e3d036aa273c1b67434fa1c (patch) | |
tree | ccb50da0e0b5166c76d065f8665f19e6afe0c617 | |
parent | 0c31f55bcfd6630d894dd2dda6ca483bea5de4ab (diff) | |
download | meta-openembedded-b17bbbe2245f72144e3d036aa273c1b67434fa1c.tar.gz |
gitver: fix try/except syntax for python3 support
https://www.python.org/dev/peps/pep-3110/
It's backward compatible with 2.6+
Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/classes/gitver.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass index 71bf42fbcd..a16429aa89 100644 --- a/meta-oe/classes/gitver.bbclass +++ b/meta-oe/classes/gitver.bbclass | |||
@@ -27,13 +27,13 @@ def get_git_pv(path, d, tagadjust=None): | |||
27 | gitdir = os.path.abspath(os.path.join(d.getVar("S"), ".git")) | 27 | gitdir = os.path.abspath(os.path.join(d.getVar("S"), ".git")) |
28 | try: | 28 | try: |
29 | ver = gitrev_run("git describe --tags", gitdir) | 29 | ver = gitrev_run("git describe --tags", gitdir) |
30 | except Exception, exc: | 30 | except Exception as exc: |
31 | bb.fatal(str(exc)) | 31 | bb.fatal(str(exc)) |
32 | 32 | ||
33 | if not ver: | 33 | if not ver: |
34 | try: | 34 | try: |
35 | ver = gitrev_run("git rev-parse --short HEAD", gitdir) | 35 | ver = gitrev_run("git rev-parse --short HEAD", gitdir) |
36 | except Exception, exc: | 36 | except Exception as exc: |
37 | bb.fatal(str(exc)) | 37 | bb.fatal(str(exc)) |
38 | 38 | ||
39 | if ver: | 39 | if ver: |