diff options
author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2022-03-16 23:45:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-18 23:32:46 +0000 |
commit | d68b2090e95ff97538b03f49e2fca6612b6eb456 (patch) | |
tree | f26c96d4a306d52478f64d54a0d0ce44f2df5638 /scripts | |
parent | 6a89afe15610fa1d89a4c6c2c858c481fbcb8052 (diff) | |
download | poky-d68b2090e95ff97538b03f49e2fca6612b6eb456.tar.gz |
scripts/patchreview: handle Inactive-Upstream status
(From OE-Core rev: 44afce53725f59fefb0ca5df6babe2b8bec6a68b)
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-x | scripts/contrib/patchreview.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/contrib/patchreview.py b/scripts/contrib/patchreview.py index 62c509f51c..dc417b4c55 100755 --- a/scripts/contrib/patchreview.py +++ b/scripts/contrib/patchreview.py | |||
@@ -8,7 +8,7 @@ | |||
8 | # - test suite | 8 | # - test suite |
9 | # - validate signed-off-by | 9 | # - validate signed-off-by |
10 | 10 | ||
11 | status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied") | 11 | status_values = ("accepted", "pending", "inappropriate", "backport", "submitted", "denied", "inactive-upstream") |
12 | 12 | ||
13 | class Result: | 13 | class Result: |
14 | # Whether the patch has an Upstream-Status or not | 14 | # Whether the patch has an Upstream-Status or not |
@@ -46,7 +46,7 @@ def patchreview(path, patches): | |||
46 | # hyphen or spaces, maybe a colon, some whitespace, then the value, all case | 46 | # hyphen or spaces, maybe a colon, some whitespace, then the value, all case |
47 | # insensitive. | 47 | # insensitive. |
48 | sob_re = re.compile(r"^[\t ]*(Signed[-_ ]off[-_ ]by:?)[\t ]*(.+)", re.IGNORECASE | re.MULTILINE) | 48 | sob_re = re.compile(r"^[\t ]*(Signed[-_ ]off[-_ ]by:?)[\t ]*(.+)", re.IGNORECASE | re.MULTILINE) |
49 | status_re = re.compile(r"^[\t ]*(Upstream[-_ ]Status:?)[\t ]*(\w*)", re.IGNORECASE | re.MULTILINE) | 49 | status_re = re.compile(r"^[\t ]*(Upstream[-_ ]Status:?)[\t ]*([\w-]*)", re.IGNORECASE | re.MULTILINE) |
50 | cve_tag_re = re.compile(r"^[\t ]*(CVE:)[\t ]*(.*)", re.IGNORECASE | re.MULTILINE) | 50 | cve_tag_re = re.compile(r"^[\t ]*(CVE:)[\t ]*(.*)", re.IGNORECASE | re.MULTILINE) |
51 | cve_re = re.compile(r"cve-[0-9]{4}-[0-9]{4,6}", re.IGNORECASE) | 51 | cve_re = re.compile(r"cve-[0-9]{4}-[0-9]{4,6}", re.IGNORECASE) |
52 | 52 | ||