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

Alejandro Mery amery at hanoverdisplays.com
Sat Mar 4 13:35:40 UTC 2017


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 at 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?


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

thank you



More information about the Openembedded-devel mailing list