diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2013-04-08 19:06:33 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-10 09:23:18 +0100 |
commit | 4330e152ab743b2df447221ee953b8a1f8990903 (patch) | |
tree | 5285d71fdbba0672a55e26fda182a77d6242533e /bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | |
parent | f32d58076e969d43bf9ffb3592ed2788d1741da8 (diff) | |
download | poky-4330e152ab743b2df447221ee953b8a1f8990903.tar.gz |
bitbake: bitbake:hob: use a socks proxy mechanism for git
Instead of a custom git proxy mechanism, Hob now
uses a SOCKS proxy in order to work with external
repos via the oe-git-proxy helper script.
Fixes [YOCTO #4187]
(Bitbake rev: 0b81a2c4a5611b64dbdd40131730a82c149b94a2)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Cristian Iorga <ubik3000@gmail.com>
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py')
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py index 8ac82ed7df..c1bd45f432 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py | |||
@@ -161,13 +161,13 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): | |||
161 | self.ftp_proxy_port.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 161 | self.ftp_proxy_port.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
162 | self.ftp_proxy_details.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 162 | self.ftp_proxy_details.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
163 | 163 | ||
164 | self.git_proxy.set_text(self.configuration.combine_host_only("git")) | 164 | self.socks_proxy.set_text(self.configuration.combine_host_only("socks")) |
165 | self.git_proxy.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 165 | self.socks_proxy.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
166 | self.git_proxy.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 166 | self.socks_proxy.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
167 | self.git_proxy_port.set_text(self.configuration.combine_port_only("git")) | 167 | self.socks_proxy_port.set_text(self.configuration.combine_port_only("socks")) |
168 | self.git_proxy_port.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 168 | self.socks_proxy_port.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
169 | self.git_proxy_port.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 169 | self.socks_proxy_port.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
170 | self.git_proxy_details.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 170 | self.socks_proxy_details.set_sensitive(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
171 | 171 | ||
172 | self.cvs_proxy.set_text(self.configuration.combine_host_only("cvs")) | 172 | self.cvs_proxy.set_text(self.configuration.combine_host_only("cvs")) |
173 | self.cvs_proxy.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) | 173 | self.cvs_proxy.set_editable(self.configuration.enable_proxy and (not self.configuration.same_proxy)) |
@@ -201,12 +201,12 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): | |||
201 | if self.configuration.same_proxy: | 201 | if self.configuration.same_proxy: |
202 | self.configuration.split_proxy("https", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) | 202 | self.configuration.split_proxy("https", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) |
203 | self.configuration.split_proxy("ftp", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) | 203 | self.configuration.split_proxy("ftp", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) |
204 | self.configuration.split_proxy("git", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) | 204 | self.configuration.split_proxy("socks", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) |
205 | self.configuration.split_proxy("cvs", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) | 205 | self.configuration.split_proxy("cvs", self.http_proxy.get_text() + ":" + self.http_proxy_port.get_text()) |
206 | else: | 206 | else: |
207 | self.configuration.split_proxy("https", self.https_proxy.get_text() + ":" + self.https_proxy_port.get_text()) | 207 | self.configuration.split_proxy("https", self.https_proxy.get_text() + ":" + self.https_proxy_port.get_text()) |
208 | self.configuration.split_proxy("ftp", self.ftp_proxy.get_text() + ":" + self.ftp_proxy_port.get_text()) | 208 | self.configuration.split_proxy("ftp", self.ftp_proxy.get_text() + ":" + self.ftp_proxy_port.get_text()) |
209 | self.configuration.split_proxy("git", self.git_proxy.get_text() + ":" + self.git_proxy_port.get_text()) | 209 | self.configuration.split_proxy("socks", self.socks_proxy.get_text() + ":" + self.socks_proxy_port.get_text()) |
210 | self.configuration.split_proxy("cvs", self.cvs_proxy.get_text() + ":" + self.cvs_proxy_port.get_text()) | 210 | self.configuration.split_proxy("cvs", self.cvs_proxy.get_text() + ":" + self.cvs_proxy_port.get_text()) |
211 | 211 | ||
212 | def response_cb(self, dialog, response_id): | 212 | def response_cb(self, dialog, response_id): |
@@ -555,13 +555,13 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): | |||
555 | self.handler.set_http_proxy(self.configuration.combine_proxy("http")) | 555 | self.handler.set_http_proxy(self.configuration.combine_proxy("http")) |
556 | self.handler.set_https_proxy(self.configuration.combine_proxy("https")) | 556 | self.handler.set_https_proxy(self.configuration.combine_proxy("https")) |
557 | self.handler.set_ftp_proxy(self.configuration.combine_proxy("ftp")) | 557 | self.handler.set_ftp_proxy(self.configuration.combine_proxy("ftp")) |
558 | self.handler.set_git_proxy(self.configuration.combine_host_only("git"), self.configuration.combine_port_only("git")) | 558 | self.handler.set_socks_proxy(self.configuration.combine_proxy("socks")) |
559 | self.handler.set_cvs_proxy(self.configuration.combine_host_only("cvs"), self.configuration.combine_port_only("cvs")) | 559 | self.handler.set_cvs_proxy(self.configuration.combine_host_only("cvs"), self.configuration.combine_port_only("cvs")) |
560 | elif self.configuration.enable_proxy == False: | 560 | elif self.configuration.enable_proxy == False: |
561 | self.handler.set_http_proxy("") | 561 | self.handler.set_http_proxy("") |
562 | self.handler.set_https_proxy("") | 562 | self.handler.set_https_proxy("") |
563 | self.handler.set_ftp_proxy("") | 563 | self.handler.set_ftp_proxy("") |
564 | self.handler.set_git_proxy("", "") | 564 | self.handler.set_socks_proxy("") |
565 | self.handler.set_cvs_proxy("", "") | 565 | self.handler.set_cvs_proxy("", "") |
566 | self.proxy_test_ran = True | 566 | self.proxy_test_ran = True |
567 | self.proxy_test_running = True | 567 | self.proxy_test_running = True |
@@ -673,11 +673,11 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): | |||
673 | self.same_proxy_addresses.append(self.ftp_proxy) | 673 | self.same_proxy_addresses.append(self.ftp_proxy) |
674 | self.same_proxy_ports.append(self.ftp_proxy_port) | 674 | self.same_proxy_ports.append(self.ftp_proxy_port) |
675 | 675 | ||
676 | self.git_proxy, self.git_proxy_port, self.git_proxy_details = self.gen_proxy_entry_widget( | 676 | self.socks_proxy, self.socks_proxy_port, self.socks_proxy_details = self.gen_proxy_entry_widget( |
677 | "git", self, True, 3) | 677 | "socks", self, True, 3) |
678 | proxy_test_focus += [self.git_proxy, self.git_proxy_port] | 678 | proxy_test_focus += [self.socks_proxy, self.socks_proxy_port] |
679 | self.same_proxy_addresses.append(self.git_proxy) | 679 | self.same_proxy_addresses.append(self.socks_proxy) |
680 | self.same_proxy_ports.append(self.git_proxy_port) | 680 | self.same_proxy_ports.append(self.socks_proxy_port) |
681 | 681 | ||
682 | self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget( | 682 | self.cvs_proxy, self.cvs_proxy_port, self.cvs_proxy_details = self.gen_proxy_entry_widget( |
683 | "cvs", self, True, 4) | 683 | "cvs", self, True, 4) |