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

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

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

On Sat, Mar 04, 2017 at 01:35:40PM +0000, Alejandro Mery wrote:
> On 04/03/17 11:53, Martin Jansa wrote:
> > 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.
> 
> sorry about that. does it help to send (tested) patches against both?
> (master and morty) or backporting only happens after the change goes
> from master-next into master anyway?

Normally only after it's tested and merged in master.

You can send both at the same time, but then release branch maintainer
needs to check and hold the change until it's merged in master (or
update it if it gets updated before merge to master or even reject if
rejected for master for whatever reason). So it's easier for maintainers
if you send it after it's merged and you explicitly say which commit
from master you're backporting to morty.

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


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

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