[elbe-devel] [PATCH 3/3] commands init: Remove http_proxy logic
Olivier Dion
dion at linutronix.de
Mon Jun 1 18:12:11 CEST 2020
This is done in the xmlpreprocessor now.
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
More information about the elbe-devel
mailing list