summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorIrina Patru <irina.patru@intel.com>2014-01-23 11:49:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-01-28 00:52:57 +0000
commit914e50e5ea3c13e90dd2a8198fb6358715b976b4 (patch)
treeb8583314f89ec172ed2122cd8f2f5d67322ac959 /bitbake/lib/bb/ui
parentd24611228e07fc32e0310a9ed345ab75943f25b4 (diff)
downloadpoky-914e50e5ea3c13e90dd2a8198fb6358715b976b4.tar.gz
bitbake: hob: Don't always save proxy values in conf file
If enable_proxy is not activated, Hob should not save the proxy values in the conf file when user hits save button. [ HOB #5308 ] (Bitbake rev: fbe0851221ecfcefea5bdd4b629a05ed4f5ac189) Signed-off-by: Irina Patru <irina.patru@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builder.py20
1 files changed, 14 insertions, 6 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py
index 1eae814943..7bc3227509 100755
--- a/bitbake/lib/bb/ui/crumbs/builder.py
+++ b/bitbake/lib/bb/ui/crumbs/builder.py
@@ -229,12 +229,20 @@ class Configuration:
229 # proxy 229 # proxy
230 handler.set_var_in_file("enable_proxy", self.enable_proxy, "local.conf") 230 handler.set_var_in_file("enable_proxy", self.enable_proxy, "local.conf")
231 handler.set_var_in_file("use_same_proxy", self.same_proxy, "local.conf") 231 handler.set_var_in_file("use_same_proxy", self.same_proxy, "local.conf")
232 handler.set_var_in_file("http_proxy", self.combine_proxy("http"), "local.conf") 232 if self.enable_proxy == True:
233 handler.set_var_in_file("https_proxy", self.combine_proxy("https"), "local.conf") 233 handler.set_var_in_file("http_proxy", self.combine_proxy("http"), "local.conf")
234 handler.set_var_in_file("ftp_proxy", self.combine_proxy("ftp"), "local.conf") 234 handler.set_var_in_file("https_proxy", self.combine_proxy("https"), "local.conf")
235 handler.set_var_in_file("all_proxy", self.combine_proxy("socks"), "local.conf") 235 handler.set_var_in_file("ftp_proxy", self.combine_proxy("ftp"), "local.conf")
236 handler.set_var_in_file("CVS_PROXY_HOST", self.combine_host_only("cvs"), "local.conf") 236 handler.set_var_in_file("all_proxy", self.combine_proxy("socks"), "local.conf")
237 handler.set_var_in_file("CVS_PROXY_PORT", self.combine_port_only("cvs"), "local.conf") 237 handler.set_var_in_file("CVS_PROXY_HOST", self.combine_host_only("cvs"), "local.conf")
238 handler.set_var_in_file("CVS_PROXY_PORT", self.combine_port_only("cvs"), "local.conf")
239 else:
240 handler.set_var_in_file("http_proxy", "", "local.conf")
241 handler.set_var_in_file("https_proxy", "", "local.conf")
242 handler.set_var_in_file("ftp_proxy", "", "local.conf")
243 handler.set_var_in_file("all_proxy", "", "local.conf")
244 handler.set_var_in_file("CVS_PROXY_HOST", "", "local.conf")
245 handler.set_var_in_file("CVS_PROXY_PORT", "", "local.conf")
238 246
239 def __str__(self): 247 def __str__(self):
240 s = "VERSION: '%s', BBLAYERS: '%s', MACHINE: '%s', DISTRO: '%s', DL_DIR: '%s'," % \ 248 s = "VERSION: '%s', BBLAYERS: '%s', MACHINE: '%s', DISTRO: '%s', DL_DIR: '%s'," % \