From ce0a6f81aeff83189eef64e7521ca12ccd20f00b Mon Sep 17 00:00:00 2001 From: Cristiana Voicu Date: Tue, 8 Oct 2013 13:58:25 +0300 Subject: [PATCH] bitbake: hob: Hob should ask for ports only when Manual proxy is selected [YOCTO #5307] (Bitbake rev: 09b3e4e1e3fac737ea4069457e8bbffe1a4fe09d) Signed-off-by: Cristiana Voicu Signed-off-by: Richard Purdie --- .../bb/ui/crumbs/hig/simplesettingsdialog.py | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py index de924b1206..4a7cfad52c 100644 --- a/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py +++ b/bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py @@ -211,18 +211,20 @@ class SimpleSettingsDialog (CrumbsDialog, SettingsUIHelper): def response_cb(self, dialog, response_id): if response_id == gtk.RESPONSE_YES: - # Check that all proxy entries have a corresponding port - for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports): - if proxy.get_text() and not port.get_text(): - lbl = "Enter all port numbers\n\n" - msg = "Proxy servers require a port number. Please make sure you have entered a port number for each proxy server." - dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING, msg) - button = dialog.add_button("Close", gtk.RESPONSE_OK) - HobButton.style_button(button) - response = dialog.run() - dialog.destroy() - self.emit_stop_by_name("response") - return + if self.proxy_checkbox.get_active(): + # Check that all proxy entries have a corresponding port + for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports): + if proxy.get_text() and not port.get_text(): + lbl = "Enter all port numbers\n\n" + msg = "Proxy servers require a port number. Please make sure " + msg += "you have entered a port number for each proxy server." + dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING, msg) + button = dialog.add_button("Close", gtk.RESPONSE_OK) + HobButton.style_button(button) + response = dialog.run() + dialog.destroy() + self.emit_stop_by_name("response") + return self.configuration.dldir = self.dldir_text.get_text() self.configuration.sstatedir = self.sstatedir_text.get_text()