summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui/crumbs/builddetailspage.py
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-05-20 20:36:06 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-23 11:35:11 +0100
commit094742bed2fc01d55f572da946fcfa7a48521401 (patch)
treeb85f26efa2cfd5a409681bcfc3a8758d085274fc /bitbake/lib/bb/ui/crumbs/builddetailspage.py
parent10a0f9ed929449543e5caab7e5f8855e0e68605b (diff)
downloadpoky-094742bed2fc01d55f572da946fcfa7a48521401.tar.gz
replace os.popen with subprocess.Popen
Replace os.popen with subprocess.Popen since the older function would fail (more or less) silently if the executed program cannot be found There is a bb.process.run() which will invoke the Popen to run command, use it for simplify the code. For the: p4file = os.popen("%s%s files %s" % (p4cmd, p4opt, depot)) ... for file in p4file: list = file.split() in bitbake/lib/bb/fetch2/perforce.py, it should be an error in the past, since it didn't use readline() to read the pipe, but directly used the split() for the pipe. Use the bb.process.run would fix the problem since bb.process.run will return strings. More info: http://docs.python.org/library/subprocess.html#subprocess-replacements [YOCTO #2075] (Bitbake rev: 8d6700255a6d4dda403c89b171a6d4a1883e5aae) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui/crumbs/builddetailspage.py')
-rwxr-xr-xbitbake/lib/bb/ui/crumbs/builddetailspage.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index 0052b017e5..0741a7ba73 100755
--- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py
+++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
@@ -23,6 +23,7 @@
23import gtk 23import gtk
24import pango 24import pango
25import gobject 25import gobject
26import bb.process
26from bb.ui.crumbs.progressbar import HobProgressBar 27from bb.ui.crumbs.progressbar import HobProgressBar
27from bb.ui.crumbs.hobwidget import hic, HobNotebook, HobAltButton, HobWarpCellRendererText, HobButton 28from bb.ui.crumbs.hobwidget import hic, HobNotebook, HobAltButton, HobWarpCellRendererText, HobButton
28from bb.ui.crumbs.runningbuild import RunningBuildTreeView 29from bb.ui.crumbs.runningbuild import RunningBuildTreeView
@@ -97,9 +98,9 @@ class BuildConfigurationTreeView(gtk.TreeView):
97 for path in src_config_info.layers: 98 for path in src_config_info.layers:
98 import os, os.path 99 import os, os.path
99 if os.path.exists(path): 100 if os.path.exists(path):
100 f = os.popen('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path) 101 f, errors = bb.process.run('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path)
101 if f: 102 if f:
102 branch = f.readline().lstrip('\n').rstrip('\n') 103 branch = f.strip('\n')
103 vars.append(self.set_vars("Branch:", branch)) 104 vars.append(self.set_vars("Branch:", branch))
104 f.close() 105 f.close()
105 break 106 break