Re: [gentoo-dev] [PATCH] git-r3.eclass: Support EGIT_SUBMODULES to filter used submodules, #497164

[Michał Górny]

On Mon, 23 May 2016 22:06:03 +0200
Patrice Clement <monsieurp@g.o> wrote:

> Monday 23 May 2016 21:54:19, Michał Górny wrote :
> > ---
> >  eclass/git-r3.eclass | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++-
> >  1 file changed, 52 insertions(+), 1 deletion(-)
> >
> > diff --git a/eclass/git-r3.eclass b/eclass/git-r3.eclass
> > index 957ff08..61218a8 100644
> > --- a/eclass/git-r3.eclass
> > +++ b/eclass/git-r3.eclass
> > @@ -165,6 +165,36 @@ fi
> >  #
> >  # EGIT_CHECKOUT_DIR=${WORKDIR}/${P}
> >
> > +# @ECLASS-VARIABLE: EGIT_SUBMODULES
> > +# @DEFAULT_UNSET
> > +# @DESCRIPTION:
> > +# An array of inclusive and exclusive wildcards on submodule names,
> > +# stating which submodules are fetched and checked out. Exclusions
> > +# start with '-', and exclude previously matched submodules.
> > +#
> > +# If unset, all submodules are enabled. Empty list disables all
> > +# submodules. In order to use an exclude-only list, start the array
> > +# with '*'.
> > +#
> > +# Remember that wildcards need to be quoted in order to prevent filename
> > +# expansion.
> > +#
> > +# Examples:
> > +# @CODE
> > +# # Disable all submodules
> > +# EGIT_SUBMODULES=()
> > +#
> > +# # Include only foo and bar
> > +# EGIT_SUBMODULES=( foo bar )
> > +#
> > +# # Use all submodules except for test-* but include test-lib
> > +# EGIT_SUBMODULES=( '*' '-test-*' test-lib )
> > +# @CODE
> > +if [[ ${EGIT_SUBMODULES[@]+1} && $(declare -p EGIT_SUBMODULES) != "declare -a"* ]]
> > +then
> > +	die 'EGIT_SUBMODULES must be an array.'
> > +fi
> > +
> >  # @FUNCTION: _git-r3_env_setup
> >  # @INTERNAL
> >  # @DESCRIPTION:
> > @@ -243,7 +273,8 @@ _git-r3_env_setup() {
> >  	if [[ ${EGIT_HAS_SUBMODULES} ]]; then
> >  		eerror "EGIT_HAS_SUBMODULES has been removed. The eclass no longer needs"
> >  		eerror "to switch the clone type in order to support submodules and therefore"
> > -		eerror "submodules are detected and fetched automatically."
> > +		eerror "submodules are detected and fetched automatically. If you need to"
> > +		eerror "disable or filter submodules, see EGIT_SUBMODULES."
> >  		die "EGIT_HAS_SUBMODULES is no longer necessary."
> >  	fi
> >
> > @@ -357,6 +388,26 @@ _git-r3_set_submodules() {
> >  		l=${l#submodule.}
> >  		local subname=${l%%.url=*}
> >
> > +		# filter out on EGIT_SUBMODULES
> > +		if declare -p EGIT_SUBMODULES &>/dev/null; then
> > +			local p res= l_res
>
> Watch out for the extra space.

Just moved through the line back and forth in vim and I don't see any
extra space...

-- 
Best regards,
Michał Górny
<http://dev.gentoo.org/~mgorny/>