HOB: 'str' object has no attribute 'close'
For builddetailspage.py: The "f" was a stream in the past, it is a string now, so it doesn't need f.close(), and change its name to "branch". And we don't need the "2>&1" since bb.process.run() can handle it, it will raise exception when error occurs, we should handle the exception ourselves if we want to ignore the error. For hig.py: Use bb.process.Popen() since it doesn't need the return value. If we use bb.process.run(), the parent process will wait for the child process to terminate to get the result. [YOCTO #2511] (Bitbake rev: ab10f3da1976581c371c43cdb88f405cf6fbcd95) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
9b6d3f48d2
commit
cc3da1236c
|
@ -98,11 +98,10 @@ class BuildConfigurationTreeView(gtk.TreeView):
|
|||
for path in src_config_info.layers:
|
||||
import os, os.path
|
||||
if os.path.exists(path):
|
||||
f, errors = bb.process.run('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path)
|
||||
if f:
|
||||
branch = f.strip('\n')
|
||||
branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0]
|
||||
if branch:
|
||||
branch = branch.strip('\n')
|
||||
vars.append(self.set_vars("Branch:", branch))
|
||||
f.close()
|
||||
break
|
||||
|
||||
self.set_config_model(vars)
|
||||
|
|
|
@ -831,7 +831,7 @@ class DeployImageDialog (CrumbsDialog):
|
|||
cmdline = bb.ui.crumbs.utils.which_terminal()
|
||||
if cmdline:
|
||||
cmdline += "\"sudo dd if=" + self.image_path + " of=" + combo_item + "\""
|
||||
bb.process.run(shlex.split(cmdline))
|
||||
bb.process.Popen(shlex.split(cmdline))
|
||||
|
||||
def update_progress_bar(self, title, fraction, status=None):
|
||||
self.progress_bar.update(fraction)
|
||||
|
|
Loading…
Reference in New Issue