diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-12 11:36:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-14 11:42:19 +0000 |
| commit | 5fc5996c23643ef2e0e316f60d587ced545a769f (patch) | |
| tree | c5b353c12032e1a317059cc2378dd925a56c776a /meta | |
| parent | 7c3d4c033e90c023a6989bc81c77f1120125421c (diff) | |
| download | poky-5fc5996c23643ef2e0e316f60d587ced545a769f.tar.gz | |
buildhistory: Fix regex to handle versions without spaces
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.
(From OE-Core rev: 613e96b06202f31870be411ca45b44237ae55b1c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/buildhistory.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 3c4647ac7b..a5a85ff4fc 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass | |||
| @@ -145,7 +145,7 @@ python buildhistory_emit_pkghistory() { | |||
| 145 | return None | 145 | return None |
| 146 | 146 | ||
| 147 | def sortpkglist(string): | 147 | def sortpkglist(string): |
| 148 | pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+ [^ )]+\))?', string, 0) | 148 | pkgiter = re.finditer(r'[a-zA-Z0-9.+-]+( \([><=]+[^)]+\))?', string, 0) |
| 149 | pkglist = [p.group(0) for p in pkgiter] | 149 | pkglist = [p.group(0) for p in pkgiter] |
| 150 | pkglist.sort() | 150 | pkglist.sort() |
| 151 | return ' '.join(pkglist) | 151 | return ' '.join(pkglist) |