[elbe-devel] [PATCH 3/3] commands init: Remove http_proxy logic

[Torben Hohn]

On Mon, Jun 01, 2020 at 12:12:11PM -0400, Olivier Dion wrote:
> This is done in the xmlpreprocessor now.

you have to remove the option from the oparser also.

and adjust the man page.

and also adjust the other manpages of the commands, that use
PreprocessWrapper


> 
> Signed-off-by: Olivier Dion <dion at linutronix.de>
> ---
>  elbepack/commands/init.py | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
> index a97d45df..039fd194 100644
> --- a/elbepack/commands/init.py
> +++ b/elbepack/commands/init.py
> @@ -133,11 +133,7 @@ def run_command(argv):
>          defs = ElbeDefaults(buildtype)
>  
>          http_proxy = ""
> -        if os.getenv("http_proxy"):
> -            http_proxy = os.getenv("http_proxy")
> -        elif opt.proxy:
> -            http_proxy = opt.proxy
> -        elif xml.has("initvm/mirror/primary_proxy"):
> +        if xml.has("initvm/mirror/primary_proxy"):
>              http_proxy = xml.text("initvm/mirror/primary_proxy")
>              http_proxy = http_proxy.strip().replace("LOCALMACHINE",
>                                                      "localhost")
> -- 
> 2.26.2
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner