diff options
| -rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builder.py | 11 | ||||
| -rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig.py | 8 |
2 files changed, 12 insertions, 7 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builder.py b/bitbake/lib/bb/ui/crumbs/builder.py index 95402e04ba..d8d09871cf 100755 --- a/bitbake/lib/bb/ui/crumbs/builder.py +++ b/bitbake/lib/bb/ui/crumbs/builder.py @@ -37,6 +37,7 @@ from bb.ui.crumbs.hig import CrumbsMessageDialog, ImageSelectionDialog, \ AdvancedSettingDialog, LayerSelectionDialog, \ DeployImageDialog from bb.ui.crumbs.persistenttooltip import PersistentTooltip +import bb.ui.crumbs.utils class Configuration: '''Represents the data structure of configuration.''' @@ -969,12 +970,13 @@ class Builder(gtk.Window): if response == gtk.RESPONSE_YES: source_env_path = os.path.join(self.parameters.core_base, "oe-init-build-env") tmp_path = self.parameters.tmpdir + cmdline = bb.ui.crumbs.utils.which_terminal() if os.path.exists(image_path) and os.path.exists(kernel_path) \ - and os.path.exists(source_env_path) and os.path.exists(tmp_path): - cmdline = "/usr/bin/xterm -e " - cmdline += "\" export OE_TMPDIR=" + tmp_path + "; " + and os.path.exists(source_env_path) and os.path.exists(tmp_path) + and cmdline: + cmdline += "\' bash -c \"export OE_TMPDIR=" + tmp_path + "; " cmdline += "source " + source_env_path + " " + os.getcwd() + "; " - cmdline += "runqemu " + kernel_path + " " + image_path + "; bash\"" + cmdline += "runqemu " + kernel_path + " " + image_path + "\"\'" subprocess.Popen(shlex.split(cmdline)) else: lbl = "<b>Path error</b>\nOne of your paths is wrong," @@ -983,6 +985,7 @@ class Builder(gtk.Window): lbl = lbl + "kernel path:" + kernel_path + "\n" lbl = lbl + "source environment path:" + source_env_path + "\n" lbl = lbl + "tmp path: " + tmp_path + "." + lbl = lbl + "You may be missing either xterm or vte for terminal services." dialog = CrumbsMessageDialog(self, lbl, gtk.STOCK_DIALOG_ERROR) button = dialog.add_button("Close", gtk.RESPONSE_OK) HobButton.style_button(button) diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index 016fb59acb..5cc8a5931a 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py @@ -30,6 +30,7 @@ import shlex from bb.ui.crumbs.hobcolor import HobColors from bb.ui.crumbs.hobwidget import hcc, hic, HobViewTable, HobInfoButton, HobButton, HobAltButton, HobIconChecker from bb.ui.crumbs.progressbar import HobProgressBar +import bb.ui.crumbs.utils """ The following are convenience classes for implementing GNOME HIG compliant @@ -739,9 +740,10 @@ class DeployImageDialog (CrumbsDialog): if response_id == gtk.RESPONSE_YES: combo_item = self.usb_combo.get_active_text() if combo_item and combo_item != self.__dummy_usb__: - cmdline = "/usr/bin/xterm -e " - cmdline += "\"sudo dd if=" + self.image_path + " of=" + combo_item + "; bash\"" - subprocess.Popen(args=shlex.split(cmdline)) + cmdline = bb.ui.crumbs.utils.which_terminal() + if cmdline: + cmdline += "\"sudo dd if=" + self.image_path + " of=" + combo_item + "\"" + subprocess.Popen(args=shlex.split(cmdline)) def update_progress_bar(self, title, fraction, status=None): self.progress_bar.update(fraction) |