diff options
| author | Irina Patru <irina.patru@intel.com> | 2014-01-23 11:49:42 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-01-28 00:52:57 +0000 |
| commit | 914e50e5ea3c13e90dd2a8198fb6358715b976b4 (patch) | |
| tree | b8583314f89ec172ed2122cd8f2f5d67322ac959 | |
| parent | d24611228e07fc32e0310a9ed345ab75943f25b4 (diff) | |
| download | ast2050-yocto-poky-914e50e5ea3c13e90dd2a8198fb6358715b976b4.zip ast2050-yocto-poky-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>
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 20 |
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 1eae814..7bc3227 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -229,12 +229,20 @@ class Configuration: # proxy handler.set_var_in_file("enable_proxy", self.enable_proxy, "local.conf") handler.set_var_in_file("use_same_proxy", self.same_proxy, "local.conf") - handler.set_var_in_file("http_proxy", self.combine_proxy("http"), "local.conf") - handler.set_var_in_file("https_proxy", self.combine_proxy("https"), "local.conf") - handler.set_var_in_file("ftp_proxy", self.combine_proxy("ftp"), "local.conf") - handler.set_var_in_file("all_proxy", self.combine_proxy("socks"), "local.conf") - handler.set_var_in_file("CVS_PROXY_HOST", self.combine_host_only("cvs"), "local.conf") - handler.set_var_in_file("CVS_PROXY_PORT", self.combine_port_only("cvs"), "local.conf") + if self.enable_proxy == True: + handler.set_var_in_file("http_proxy", self.combine_proxy("http"), "local.conf") + handler.set_var_in_file("https_proxy", self.combine_proxy("https"), "local.conf") + handler.set_var_in_file("ftp_proxy", self.combine_proxy("ftp"), "local.conf") + handler.set_var_in_file("all_proxy", self.combine_proxy("socks"), "local.conf") + handler.set_var_in_file("CVS_PROXY_HOST", self.combine_host_only("cvs"), "local.conf") + handler.set_var_in_file("CVS_PROXY_PORT", self.combine_port_only("cvs"), "local.conf") + else: + handler.set_var_in_file("http_proxy", "", "local.conf") + handler.set_var_in_file("https_proxy", "", "local.conf") + handler.set_var_in_file("ftp_proxy", "", "local.conf") + handler.set_var_in_file("all_proxy", "", "local.conf") + handler.set_var_in_file("CVS_PROXY_HOST", "", "local.conf") + handler.set_var_in_file("CVS_PROXY_PORT", "", "local.conf") def __str__(self): s = "VERSION: '%s', BBLAYERS: '%s', MACHINE: '%s', DISTRO: '%s', DL_DIR: '%s'," % \ |
