* [meta-oe][PATCH] gitver: fix try/except syntax for python3 support
@ 2017-03-01 14:19 Alejandro Mery
2017-03-01 14:22 ` Alejandro Mery
0 siblings, 1 reply; 5+ messages in thread
From: Alejandro Mery @ 2017-03-01 14:19 UTC (permalink / raw)
To: openembedded-devel; +Cc: amery
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:
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] gitver: fix try/except syntax for python3 support
2017-03-01 14:19 [meta-oe][PATCH] gitver: fix try/except syntax for python3 support Alejandro Mery
@ 2017-03-01 14:22 ` Alejandro Mery
2017-03-04 11:53 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Alejandro Mery @ 2017-03-01 14:22 UTC (permalink / raw)
To: openembedded-devel; +Cc: amery
[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]
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`
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] gitver: fix try/except syntax for python3 support
2017-03-01 14:22 ` Alejandro Mery
@ 2017-03-04 11:53 ` Martin Jansa
2017-03-04 13:35 ` Alejandro Mery
0 siblings, 1 reply; 5+ messages in thread
From: Martin Jansa @ 2017-03-04 11:53 UTC (permalink / raw)
To: Alejandro Mery; +Cc: amery, openembedded-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] gitver: fix try/except syntax for python3 support
2017-03-04 11:53 ` Martin Jansa
@ 2017-03-04 13:35 ` Alejandro Mery
2017-03-04 14:55 ` Martin Jansa
0 siblings, 1 reply; 5+ messages in thread
From: Alejandro Mery @ 2017-03-04 13:35 UTC (permalink / raw)
To: Martin Jansa; +Cc: amery, openembedded-devel
[-- Attachment #1: Type: text/plain, Size: 1648 bytes --]
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?
> I've applied this manually to master-next now.
thank you
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [meta-oe][PATCH] gitver: fix try/except syntax for python3 support
2017-03-04 13:35 ` Alejandro Mery
@ 2017-03-04 14:55 ` Martin Jansa
0 siblings, 0 replies; 5+ messages in thread
From: Martin Jansa @ 2017-03-04 14:55 UTC (permalink / raw)
To: Alejandro Mery; +Cc: amery, openembedded-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-04 14:55 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-01 14:19 [meta-oe][PATCH] gitver: fix try/except syntax for python3 support Alejandro Mery
2017-03-01 14:22 ` Alejandro Mery
2017-03-04 11:53 ` Martin Jansa
2017-03-04 13:35 ` Alejandro Mery
2017-03-04 14:55 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.