* [PATCH] buildhistory: Fix regex to handle versions without spaces
@ 2016-02-12 11:36 Richard Purdie
2016-02-14 19:58 ` Paul Eggleton
0 siblings, 1 reply; 2+ messages in thread
From: Richard Purdie @ 2016-02-12 11:36 UTC (permalink / raw)
To: openembedded-core
Its valid to have dependencies like XXX (=2.1) without spaces, as injected
by debian.bbclass. The code was breaking these into separate components
and destroying them so improve the regex to handle them.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 32e096b..52a5f31 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -145,7 +145,7 @@ python buildhistory_emit_pkghistory() {
return None
def sortpkglist(string):
- pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+ [^ )]+\))?', string, 0)
+ pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+[^)]+\))?', string, 0)
pkglist = [p.group(0) for p in pkgiter]
pkglist.sort()
return ' '.join(pkglist)
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] buildhistory: Fix regex to handle versions without spaces
2016-02-12 11:36 [PATCH] buildhistory: Fix regex to handle versions without spaces Richard Purdie
@ 2016-02-14 19:58 ` Paul Eggleton
0 siblings, 0 replies; 2+ messages in thread
From: Paul Eggleton @ 2016-02-14 19:58 UTC (permalink / raw)
To: openembedded-core
On Fri, 12 Feb 2016 11:36:13 Richard Purdie wrote:
> Its valid to have dependencies like XXX (=2.1) without spaces, as injected
> by debian.bbclass. The code was breaking these into separate components
> and destroying them so improve the regex to handle them.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>
> diff --git a/meta/classes/buildhistory.bbclass
> b/meta/classes/buildhistory.bbclass index 32e096b..52a5f31 100644
> --- a/meta/classes/buildhistory.bbclass
> +++ b/meta/classes/buildhistory.bbclass
> @@ -145,7 +145,7 @@ python buildhistory_emit_pkghistory() {
> return None
>
> def sortpkglist(string):
> - pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+ [^ )]+\))?',
> string, 0)
> + pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+(
> \([><=]+[^)]+\))?', string, 0) pkglist = [p.group(0) for p in pkgiter]
> pkglist.sort()
> return ' '.join(pkglist)
Acked-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Cheers,
Paul
--
Paul Eggleton
Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-02-14 19:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-12 11:36 [PATCH] buildhistory: Fix regex to handle versions without spaces Richard Purdie
2016-02-14 19:58 ` Paul Eggleton
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox