Re: [meta-oe][PATCH] gitver: fix try/except syntax for python3 support

[Martin Jansa <martin.jansa@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1479 bytes --]

On Wed, Mar 01, 2017 at 02:22:29PM +0000, Alejandro Mery wrote:
> On 01/03/17 14:19, Alejandro Mery wrote:
> > https://www.python.org/dev/peps/pep-3110/
> >
> > It's backward compatible with 2.6+
> >
> > Signed-off-by: Alejandro Mery <amery@hanoverdisplays.com>
> > ---
> >  meta-oe/classes/gitver.bbclass | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta-oe/classes/gitver.bbclass b/meta-oe/classes/gitver.bbclass
> > index e7b5155ee..b677996ea 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):
> >      gitdir = os.path.abspath(os.path.join(d.getVar("S", True), ".git"))
> >      try:
> >          ver = gitrev_run("git describe --tags", gitdir)
> > -    except Exception, exc:
> > +    except Exception as exc:
> >          bb.fatal(str(exc))
> >
> >      if not ver:
> >          try:
> >              ver = gitrev_run("git rev-parse --short HEAD", gitdir)
> > -        except Exception, exc:
> > +        except Exception as exc:
> >              bb.fatal(str(exc))
> >
> >          if ver:
> 
> I forgot to mention, I'm having this problem using `morty`

Next time, please send version applicable and tested in master branch first, then
you can request backport to morty.

I've applied this manually to master-next now.

Thanks

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 201 bytes --]