diff options
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builddetailspage.py | 7 | ||||
-rw-r--r-- | bitbake/lib/bb/ui/crumbs/hig.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py index 0741a7ba73..b1afe10bbc 100755 --- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py | |||
@@ -98,11 +98,10 @@ class BuildConfigurationTreeView(gtk.TreeView): | |||
98 | for path in src_config_info.layers: | 98 | for path in src_config_info.layers: |
99 | import os, os.path | 99 | import os, os.path |
100 | if os.path.exists(path): | 100 | if os.path.exists(path): |
101 | f, errors = bb.process.run('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path) | 101 | branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0] |
102 | if f: | 102 | if branch: |
103 | branch = f.strip('\n') | 103 | branch = branch.strip('\n') |
104 | vars.append(self.set_vars("Branch:", branch)) | 104 | vars.append(self.set_vars("Branch:", branch)) |
105 | f.close() | ||
106 | break | 105 | break |
107 | 106 | ||
108 | self.set_config_model(vars) | 107 | self.set_config_model(vars) |
diff --git a/bitbake/lib/bb/ui/crumbs/hig.py b/bitbake/lib/bb/ui/crumbs/hig.py index 42e88338bb..7c9e73fdf9 100644 --- a/bitbake/lib/bb/ui/crumbs/hig.py +++ b/bitbake/lib/bb/ui/crumbs/hig.py | |||
@@ -831,7 +831,7 @@ class DeployImageDialog (CrumbsDialog): | |||
831 | cmdline = bb.ui.crumbs.utils.which_terminal() | 831 | cmdline = bb.ui.crumbs.utils.which_terminal() |
832 | if cmdline: | 832 | if cmdline: |
833 | cmdline += "\"sudo dd if=" + self.image_path + " of=" + combo_item + "\"" | 833 | cmdline += "\"sudo dd if=" + self.image_path + " of=" + combo_item + "\"" |
834 | bb.process.run(shlex.split(cmdline)) | 834 | bb.process.Popen(shlex.split(cmdline)) |
835 | 835 | ||
836 | def update_progress_bar(self, title, fraction, status=None): | 836 | def update_progress_bar(self, title, fraction, status=None): |
837 | self.progress_bar.update(fraction) | 837 | self.progress_bar.update(fraction) |