[cip-kernel-sec,4/6] report_affected: check user supplied branch names
diff mbox series

Message ID 20190625032636.10694-5-daniel.sangorrin@toshiba.co.jp
State New
Headers show
Series
  • [cip-kernel-sec,1/6] check_git_repo: add checks to the local repository
Related show

Commit Message

Daniel Sangorrin June 25, 2019, 3:26 a.m. UTC
This makes sure that we return when the user supplied
branch names are not within the configured branches.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 scripts/report_affected.py | 3 +++
 1 file changed, 3 insertions(+)

Comments

Ben Hutchings June 28, 2019, 8:12 p.m. UTC | #1
On Tue, 2019-06-25 at 12:26 +0900, Daniel Sangorrin wrote:
> This makes sure that we return when the user supplied
> branch names are not within the configured branches.

This partly addresses my comment on patch 3, but it's still only
checking that at least one name matched a known branch.

I think the inner and outer loops should be swapped, so we can do:

        branches = []
        for name in branch_names:
            if name[0].isdigit():
                name = 'linux-%s.y' % name
            for branch in live_branches:
                if branch['short_name'] == name:
                    branches.append(branch)
                    break
            else:
                # not found; raise error

Ben.

> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> ---
>  scripts/report_affected.py | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/scripts/report_affected.py b/scripts/report_affected.py
> index bd22e29..7557dc8 100755
> --- a/scripts/report_affected.py
> +++ b/scripts/report_affected.py
> @@ -27,6 +27,9 @@ def main(git_repo, remotes,
>                      name = 'linux-%s.y' % name
>                  if branch['short_name'] == name:
>                      branches.append(branch)
> +        if not branches:
> +            msg = "supplied branches didn't match any known branch"
> +            raise argparse.ArgumentError(None, msg)
>      else:
>          branches = live_branches
>          if only_fixed_upstream:
Daniel Sangorrin July 10, 2019, 1:29 a.m. UTC | #2
> From: Ben Hutchings <ben.hutchings@codethink.co.uk>
> On Tue, 2019-06-25 at 12:26 +0900, Daniel Sangorrin wrote:
> > This makes sure that we return when the user supplied
> > branch names are not within the configured branches.
> 
> This partly addresses my comment on patch 3, but it's still only
> checking that at least one name matched a known branch.
> 
> I think the inner and outer loops should be swapped, so we can do:
> 
>         branches = []
>         for name in branch_names:
>             if name[0].isdigit():
>                 name = 'linux-%s.y' % name
>             for branch in live_branches:
>                 if branch['short_name'] == name:
>                     branches.append(branch)
>                     break
>             else:
>                 # not found; raise error
> 
> Ben.

Yes, you are right. I came up with exactly the same solution.

Thanks,
Daniel


> 
> > Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> > ---
> >  scripts/report_affected.py | 3 +++
> >  1 file changed, 3 insertions(+)
> >
> > diff --git a/scripts/report_affected.py b/scripts/report_affected.py
> > index bd22e29..7557dc8 100755
> > --- a/scripts/report_affected.py
> > +++ b/scripts/report_affected.py
> > @@ -27,6 +27,9 @@ def main(git_repo, remotes,
> >                      name = 'linux-%s.y' % name
> >                  if branch['short_name'] == name:
> >                      branches.append(branch)
> > +        if not branches:
> > +            msg = "supplied branches didn't match any known branch"
> > +            raise argparse.ArgumentError(None, msg)
> >      else:
> >          branches = live_branches
> >          if only_fixed_upstream:
> --
> Ben Hutchings, Software Developer                         Codethink Ltd
> https://www.codethink.co.uk/                 Dale House, 35 Dale Street
>                                      Manchester, M1 2HF, United Kingdom

Patch
diff mbox series

diff --git a/scripts/report_affected.py b/scripts/report_affected.py
index bd22e29..7557dc8 100755
--- a/scripts/report_affected.py
+++ b/scripts/report_affected.py
@@ -27,6 +27,9 @@  def main(git_repo, remotes,
                     name = 'linux-%s.y' % name
                 if branch['short_name'] == name:
                     branches.append(branch)
+        if not branches:
+            msg = "supplied branches didn't match any known branch"
+            raise argparse.ArgumentError(None, msg)
     else:
         branches = live_branches
         if only_fixed_upstream: