summaryrefslogtreecommitdiffstats
path: root/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:29:37 +0100
commit8d6700255a6d4dda403c89b171a6d4a1883e5aae (patch)
treed150ebc7eda3bf29e54f937d1b95d199bdddce84 /lib/bb/ui/crumbs/builddetailspage.py
parentf5b3bf115dc1ffbfb241a49cec0fc3654cb71021 (diff)
downloadbitbake-8d6700255a6d4dda403c89b171a6d4a1883e5aae.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] Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/ui/crumbs/builddetailspage.py')
-rwxr-xr-xlib/bb/ui/crumbs/builddetailspage.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/bb/ui/crumbs/builddetailspage.py b/lib/bb/ui/crumbs/builddetailspage.py
index 0052b017e..0741a7ba7 100755
--- a/lib/bb/ui/crumbs/builddetailspage.py
+++ b/lib/bb/ui/crumbs/builddetailspage.py
@@ -23,6 +23,7 @@
import gtk
import pango
import gobject
+import bb.process
from bb.ui.crumbs.progressbar import HobProgressBar
from bb.ui.crumbs.hobwidget import hic, HobNotebook, HobAltButton, HobWarpCellRendererText, HobButton
from bb.ui.crumbs.runningbuild import RunningBuildTreeView
@@ -97,9 +98,9 @@ class BuildConfigurationTreeView(gtk.TreeView):
for path in src_config_info.layers:
import os, os.path
if os.path.exists(path):
- f = os.popen('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path)
+ f, errors = bb.process.run('cd %s; git branch 2>&1 | grep "^* " | tr -d "* "' % path)
if f:
- branch = f.readline().lstrip('\n').rstrip('\n')
+ branch = f.strip('\n')
vars.append(self.set_vars("Branch:", branch))
f.close()
break