Re: [gentoo-portage-dev] [PATCH v2] install.py: ignore -Z / --context

[Zac Medico]

On 11/7/19 1:18 PM, Mike Gilbert wrote:
> The --context option accepts an optional argument, but only if it is
> passed via --context=arg. The argparse module does not deal with this
> properly.
>
> To work around this, have argparse ignore this option, and filter out
> any remaining arguments that start with a hyphen and do not occur after
> a "--" delimiter.
>
> Bug: https://bugs.gentoo.org/699548
> Signed-off-by: Mike Gilbert <floppym@g.o>
> ---
>
> If there is a cleaner way to do this, suggestions are welcome.
>
> diff --git a/bin/install.py b/bin/install.py
> index d3789ed96..495534d33 100755
> --- a/bin/install.py
> +++ b/bin/install.py
> @@ -111,12 +111,6 @@ def parse_args(args):
>  		action="store_true",
>  		dest="no_target_directory"
>  	)
> -	parser.add_argument(
> -		"--context",
> -		"-Z",
> -		action="store",
> -		dest="context"
> -	)
>  	parser.add_argument(
>  		"--verbose",
>  		"-v",
> @@ -143,11 +137,21 @@ def parse_args(args):
>  	# for known options in order for argparse to correctly
>  	# separate option arguments from file arguments in all
>  	# cases (it also allows for optparse compatibility).
> -	parsed_args = parser.parse_known_args()
> +	(opts, args) = parser.parse_known_args(args)
> +
> +	files = []
> +	i = 0
> +	while i < len(args):
> +		if args[i] == "--":
> +			i += 1
> +			break
> +		if not args[i].startswith("-"):
> +			files.append(args[i])
> +		i += 1
>
> -	opts  = parsed_args[0]
> -	files = parsed_args[1]
> -	files = [f for f in files if f != "--"]	# filter out "--"
> +	while i < len(args):
> +		files.append(args[i])
> +		i += 1
>
>  	return (opts, files)
>
>

Looks good. Please merge.
-- 
Thanks,
Zac