diff options
| -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 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'," % \ |