From: daniel.sangorrin@toshiba.co.jp (Daniel Sangorrin)
To: cip-dev@lists.cip-project.org
Subject: [cip-dev] [cip-kernel-sec 3/6] report_affected: fix code when branches are specified
Date: Tue, 25 Jun 2019 12:26:33 +0900 [thread overview]
Message-ID: <20190625032636.10694-4-daniel.sangorrin@toshiba.co.jp> (raw)
In-Reply-To: <20190625032636.10694-1-daniel.sangorrin@toshiba.co.jp>
The previous code could not handle branches with names
other than stable branch names. For example, passing
"linux-4.4.y-cip" as a branch would return an error.
Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
scripts/kernel_sec/branch.py | 8 --------
scripts/report_affected.py | 15 +++++++++------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/scripts/kernel_sec/branch.py b/scripts/kernel_sec/branch.py
index 0023497..ef88b54 100644
--- a/scripts/kernel_sec/branch.py
+++ b/scripts/kernel_sec/branch.py
@@ -21,9 +21,6 @@ import yaml
from . import version
-_STABLE_BRANCH_RE = re.compile(r'^linux-([\d.]+)\.y$')
-
-
def get_base_ver_stable_branch(base_ver):
branch_name = 'linux-%s.y' % base_ver
return {
@@ -34,11 +31,6 @@ def get_base_ver_stable_branch(base_ver):
}
-def get_stable_branch(branch_name):
- match = _STABLE_BRANCH_RE.match(branch_name)
- return match and get_base_ver_stable_branch(match.group(1))
-
-
def _extract_live_stable_branches(doc):
xhtml_ns = 'http://www.w3.org/1999/xhtml'
ns = {'html': xhtml_ns}
diff --git a/scripts/report_affected.py b/scripts/report_affected.py
index d2f1f22..bd22e29 100755
--- a/scripts/report_affected.py
+++ b/scripts/report_affected.py
@@ -18,14 +18,17 @@ import kernel_sec.version
def main(git_repo, remotes,
only_fixed_upstream, include_ignored, *branch_names):
+ live_branches = kernel_sec.branch.get_live_branches()
if branch_names:
- # Support stable release strings as shorthand for stable branches
- branches = [kernel_sec.branch.get_base_ver_stable_branch(name)
- if name[0].isdigit()
- else kernel_sec.branch.get_stable_branch(name)
- for name in branch_names]
+ branches = []
+ for branch in live_branches:
+ for name in branch_names:
+ if name[0].isdigit():
+ name = 'linux-%s.y' % name
+ if branch['short_name'] == name:
+ branches.append(branch)
else:
- branches = kernel_sec.branch.get_live_branches()
+ branches = live_branches
if only_fixed_upstream:
branches = [branch for branch in branches
if branch['short_name'] != 'mainline']
--
2.17.1
next prev parent reply other threads:[~2019-06-25 3:26 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-25 3:26 [cip-dev] fixes and support for tags Daniel Sangorrin
2019-06-25 3:26 ` [cip-dev] [cip-kernel-sec 1/6] check_git_repo: add checks to the local repository Daniel Sangorrin
2019-06-25 3:26 ` [cip-dev] [cip-kernel-sec 2/6] prepare_remotes: helper script to prepare local repo Daniel Sangorrin
2019-06-25 3:26 ` Daniel Sangorrin [this message]
2019-06-28 20:09 ` [cip-dev] [cip-kernel-sec 3/6] report_affected: fix code when branches are specified Ben Hutchings
2019-07-10 1:28 ` daniel.sangorrin at toshiba.co.jp
2019-06-25 3:26 ` [cip-dev] [cip-kernel-sec 4/6] report_affected: check user supplied branch names Daniel Sangorrin
2019-06-28 20:12 ` Ben Hutchings
2019-07-10 1:29 ` daniel.sangorrin at toshiba.co.jp
2019-06-25 3:26 ` [cip-dev] [cip-kernel-sec 5/6] report_affected: add support for reporting on tags Daniel Sangorrin
2019-06-28 20:46 ` Ben Hutchings
2019-07-10 1:36 ` daniel.sangorrin at toshiba.co.jp
2019-06-25 3:26 ` [cip-dev] [cip-kernel-sec 6/6] pep8: fix pep8-related errors such as too long lines Daniel Sangorrin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190625032636.10694-4-daniel.sangorrin@toshiba.co.jp \
--to=daniel.sangorrin@toshiba.co.jp \
--cc=cip-dev@lists.cip-project.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.