Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/grss:master commit in: grs/
Date: Sat, 20 Apr 2019 23:21:13
Message-Id: 1555676985.9d61dc4ca6b4a8f68806d336c5b6eb888332582e.blueness@gentoo
1 commit: 9d61dc4ca6b4a8f68806d336c5b6eb888332582e
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 19 12:29:40 2019 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 19 12:29:45 2019 +0000
6 URL: https://gitweb.gentoo.org/proj/grss.git/commit/?id=9d61dc4c
7
8 grs/Kernel.py: correctly parse vanilla-sources
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 grs/Kernel.py | 13 +++++++++----
13 1 file changed, 9 insertions(+), 4 deletions(-)
14
15 diff --git a/grs/Kernel.py b/grs/Kernel.py
16 index 82e6d04..3abea6a 100644
17 --- a/grs/Kernel.py
18 +++ b/grs/Kernel.py
19 @@ -67,10 +67,15 @@ class Kernel():
20 pkg_name = flavor + '-sources-' + vanilla_version + '-' + revision
21 except AttributeError:
22 # Or the verison is of the form '4.0.6-hardened' with one -
23 - _match = re.search(r'(\S+?)-(\S+)', gentoo_version)
24 - vanilla_version = _match.group(1)
25 - flavor = _match.group(2)
26 - pkg_name = flavor + '-sources-' + vanilla_version
27 + try:
28 + _match = re.search(r'(\S+?)-(\S+)', gentoo_version)
29 + vanilla_version = _match.group(1)
30 + flavor = _match.group(2)
31 + pkg_name = flavor + '-sources-' + vanilla_version
32 + except AttributeError:
33 + # Finally the verison is of the form '4.0.6' with no -
34 + vanilla_version = gentoo_version
35 + pkg_name = 'vanilla-sources-' + vanilla_version
36 pkg_name = '=sys-kernel/' + pkg_name
37 return (gentoo_version, pkg_name, has_modules)