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

[Torben Hohn]

On Wed, Jun 03, 2020 at 11:39:40AM -0400, Olivier Dion wrote:
> This is done in the xmlpreprocessor now.
> 
> Signed-off-by: Olivier Dion <dion at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  elbepack/commands/init.py | 9 +--------
>  1 file changed, 1 insertion(+), 8 deletions(-)
> 
> diff --git a/elbepack/commands/init.py b/elbepack/commands/init.py
> index a97d45df..d7978edb 100644
> --- a/elbepack/commands/init.py
> +++ b/elbepack/commands/init.py
> @@ -48,9 +48,6 @@ def run_command(argv):
>          help="Use FILE as cdrom iso, and use that to build the initvm",
>          metavar="FILE")
>  
> -    oparser.add_option("--proxy", dest="proxy",
> -                       help="Override the http Proxy")
> -
>      oparser.add_option("--buildtype", dest="buildtype",
>                         help="Override the buildtype")
>  
> @@ -133,11 +130,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.27.0
> 
> 
> _______________________________________________
> 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