summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorCristiana Voicu <cristiana.voicu@intel.com>2013-10-08 13:58:25 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:59:12 +0100
commitce0a6f81aeff83189eef64e7521ca12ccd20f00b (patch)
treea52be9314fa8a065e75a385f0d7557ff539ab8e3 /bitbake
parent3ca820de91c2456a1b1c44022072f6ce7aa21344 (diff)
downloadpoky-ce0a6f81aeff83189eef64e7521ca12ccd20f00b.tar.gz
bitbake: hob: Hob should ask for ports only when Manual proxy is selected
[YOCTO #5307] (Bitbake rev: 09b3e4e1e3fac737ea4069457e8bbffe1a4fe09d) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r--bitbake/lib/bb/ui/crumbs/hig/simplesettingsdialog.py26
1 files 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):
211 211
212 def response_cb(self, dialog, response_id): 212 def response_cb(self, dialog, response_id):
213 if response_id == gtk.RESPONSE_YES: 213 if response_id == gtk.RESPONSE_YES:
214 # Check that all proxy entries have a corresponding port 214 if self.proxy_checkbox.get_active():
215 for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports): 215 # Check that all proxy entries have a corresponding port
216 if proxy.get_text() and not port.get_text(): 216 for proxy, port in zip(self.all_proxy_addresses, self.all_proxy_ports):
217 lbl = "<b>Enter all port numbers</b>\n\n" 217 if proxy.get_text() and not port.get_text():
218 msg = "Proxy servers require a port number. Please make sure you have entered a port number for each proxy server." 218 lbl = "<b>Enter all port numbers</b>\n\n"
219 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING, msg) 219 msg = "Proxy servers require a port number. Please make sure "
220 button = dialog.add_button("Close", gtk.RESPONSE_OK) 220 msg += "you have entered a port number for each proxy server."
221 HobButton.style_button(button) 221 dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_WARNING, msg)
222 response = dialog.run() 222 button = dialog.add_button("Close", gtk.RESPONSE_OK)
223 dialog.destroy() 223 HobButton.style_button(button)
224 self.emit_stop_by_name("response") 224 response = dialog.run()
225 return 225 dialog.destroy()
226 self.emit_stop_by_name("response")
227 return
226 228
227 self.configuration.dldir = self.dldir_text.get_text() 229 self.configuration.dldir = self.dldir_text.get_text()
228 self.configuration.sstatedir = self.sstatedir_text.get_text() 230 self.configuration.sstatedir = self.sstatedir_text.get_text()