[cip-dev] [cip-kernel-sec 1/2] remotes: refer to configuration files

[cip-dev] [cip-kernel-sec 1/2] remotes: refer to configuration files

[Daniel Sangorrin]

The Readme indicated some remote names (torvalds, stable) but
not all of them. Ask the user to check conf/remotes.yml instead.
I also added information on how to override or extend the
configuration file (through '~/.config/kernel-sec/remotes.yml')

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 README.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a4f3d45..4c5808f 100644
--- a/README.md
+++ b/README.md
@@ -18,9 +18,10 @@ beneath that.  They require PyYAML and html5lib (packaged in Debian as
 python3-yaml and python3-html5lib).
 
 Many scripts require access to a kernel git repository.  By default
-this is assumed to be in `../kernel`, with remotes named `torvalds`
-and `stable` for the mainline and stable repositories.  These can
-be overridden by command-line options or by configuration.
+this is assumed to be in `../kernel`, with remotes configured in
+`conf/remotes.yml`, e.g. `torvalds`, `stable` and `cip` for the mainline,
+stable and cip repositories. These can be overridden by command-line options
+or configuration (`~/.config/kernel-sec/remotes.yml`).
 
 * `scripts/import_debian.py` - import information from Debian's
 `kernel_sec` project.  It includes all issues that Debian considers
-- 
2.17.1

[cip-dev] [cip-kernel-sec 2/2] remotes: call _get_configured_remotes

[Daniel Sangorrin]

This is probably a copy&paste mistake that had no effect
because the contents of _get_configured_remotes and
_get_configured_branches is the same.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
---
 scripts/kernel_sec/branch.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/kernel_sec/branch.py b/scripts/kernel_sec/branch.py
index ae1ca2c..3ede64a 100644
--- a/scripts/kernel_sec/branch.py
+++ b/scripts/kernel_sec/branch.py
@@ -209,7 +209,7 @@ def get_remotes(mappings, mainline=None, stable=None):
     remotes = RemoteMap()
     remotes.update(_get_configured_remotes('conf/remotes.yml'))
     remotes.update(
-        _get_configured_branches(
+        _get_configured_remotes(
             os.path.expanduser('~/.config/kernel-sec/remotes.yml')))
     for mapping in mappings:
         left, right = arg.split(':', 1)
-- 
2.17.1

[cip-dev] [cip-kernel-sec 1/2] remotes: refer to configuration files

[Ben Hutchings]

On Mon, 2019-06-17 at 11:20 +0900, Daniel Sangorrin wrote:
> The Readme indicated some remote names (torvalds, stable) but
> not all of them. Ask the user to check conf/remotes.yml instead.
> I also added information on how to override or extend the
> configuration file (through '~/.config/kernel-sec/remotes.yml')
> 
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
[...]

Applied, thanks.

Ben.

-- 
Ben Hutchings, Software Developer                ?        Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom

[cip-dev] [cip-kernel-sec 2/2] remotes: call _get_configured_remotes

[Ben Hutchings]

On Mon, 2019-06-17 at 11:20 +0900, Daniel Sangorrin wrote:
> This is probably a copy&paste mistake that had no effect
> because the contents of _get_configured_remotes and
> _get_configured_branches is the same.
> 
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>

Maybe it would make more sense to merge the two functions instead?

Ben.

> ---
> ?scripts/kernel_sec/branch.py | 2 +-
> ?1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/kernel_sec/branch.py
> b/scripts/kernel_sec/branch.py
> index ae1ca2c..3ede64a 100644
> --- a/scripts/kernel_sec/branch.py
> +++ b/scripts/kernel_sec/branch.py
> @@ -209,7 +209,7 @@ def get_remotes(mappings, mainline=None,
> stable=None):
> ?????remotes = RemoteMap()
> ?????remotes.update(_get_configured_remotes('conf/remotes.yml'))
> ?????remotes.update(
> -????????_get_configured_branches(
> +????????_get_configured_remotes(
> ?????????????os.path.expanduser('~/.config/kernel-sec/remotes.yml')))
> ?????for mapping in mappings:
> ?????????left, right = arg.split(':', 1)
-- 
Ben Hutchings, Software Developer                ?        Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom

[cip-dev] [cip-kernel-sec 2/2] remotes: call _get_configured_remotes

[daniel.sangorrin at toshiba.co.jp]

> From: Ben Hutchings <ben.hutchings@codethink.co.uk>
> 
> On Mon, 2019-06-17 at 11:20 +0900, Daniel Sangorrin wrote:
> > This is probably a copy&paste mistake that had no effect
> > because the contents of _get_configured_remotes and
> > _get_configured_branches is the same.
> >
> > Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> 
> Maybe it would make more sense to merge the two functions instead?

I thought about that but in the future you may want to add some code that is specific to one of them. If you want me to consolidate them, what name would you use?

Thanks,
Daniel

> 
> Ben.
> 
> > ---
> > ?scripts/kernel_sec/branch.py | 2 +-
> > ?1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/scripts/kernel_sec/branch.py
> > b/scripts/kernel_sec/branch.py
> > index ae1ca2c..3ede64a 100644
> > --- a/scripts/kernel_sec/branch.py
> > +++ b/scripts/kernel_sec/branch.py
> > @@ -209,7 +209,7 @@ def get_remotes(mappings, mainline=None,
> > stable=None):
> > ?????remotes = RemoteMap()
> > ?????remotes.update(_get_configured_remotes('conf/remotes.yml'))
> > ?????remotes.update(
> > -????????_get_configured_branches(
> > +????????_get_configured_remotes(
> > ?????????????os.path.expanduser('~/.config/kernel-sec/remotes.yml')))
> > ?????for mapping in mappings:
> > ?????????left, right = arg.split(':', 1)
> --
> Ben Hutchings, Software Developer                ?        Codethink Ltd
> https://www.codethink.co.uk/                 Dale House, 35 Dale Street
>                                      Manchester, M1 2HF, United Kingdom

[cip-dev] [cip-kernel-sec 2/2] remotes: call _get_configured_remotes

[Ben Hutchings]

On Mon, 2019-06-17 at 23:48 +0000, daniel.sangorrin at toshiba.co.jp
wrote:
> > From: Ben Hutchings <ben.hutchings@codethink.co.uk>
> > 
> > On Mon, 2019-06-17 at 11:20 +0900, Daniel Sangorrin wrote:
> > > This is probably a copy&paste mistake that had no effect
> > > because the contents of _get_configured_remotes and
> > > _get_configured_branches is the same.
> > > 
> > > Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp>
> > 
> > Maybe it would make more sense to merge the two functions instead?
> 
> I thought about that but in the future you may want to add some code
> that is specific to one of them. If you want me to consolidate them,
> what name would you use?

Actually these two functions aren't exactly the same, since the default
return value differs.  In practice that doesn't make a difference at
the moment, but logically it would be wrong to return one or the other.

So I'll apply your original patch.

Ben.

-- 
Ben Hutchings, Software Developer                ?        Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom