diff options
author | Cristiana Voicu <cristiana.voicu@intel.com> | 2012-09-26 16:11:41 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-27 16:45:25 +0100 |
commit | 6fdff49d9b37a18221f8d5571f757e69b945e533 (patch) | |
tree | 69abe4bf0ed79404723ecf670b340328e7c2109e /bitbake/lib | |
parent | 0e1a427a2558ca09bc71b4d549c468198af7e01c (diff) | |
download | poky-6fdff49d9b37a18221f8d5571f757e69b945e533.tar.gz |
bitbake: hob/builddetailspage: change branch field
When a user makes a build from a tarball, it shows fatal error in branch field.
Now it not complains as a fatal error. It is a normal message.
[YOCTO #3114]
(Bitbake rev: 53d5d542cd0197ca67c5f90a57808af2f19ff56d)
Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rwxr-xr-x | bitbake/lib/bb/ui/crumbs/builddetailspage.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py index 55a851feeb..50073c1fe1 100755 --- a/bitbake/lib/bb/ui/crumbs/builddetailspage.py +++ b/bitbake/lib/bb/ui/crumbs/builddetailspage.py | |||
@@ -99,6 +99,8 @@ class BuildConfigurationTreeView(gtk.TreeView): | |||
99 | import os, os.path | 99 | import os, os.path |
100 | if os.path.exists(path): | 100 | if os.path.exists(path): |
101 | branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0] | 101 | branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0] |
102 | if branch.startswith("fatal:"): | ||
103 | branch = "(unknown)" | ||
102 | if branch: | 104 | if branch: |
103 | branch = branch.strip('\n') | 105 | branch = branch.strip('\n') |
104 | vars.append(self.set_vars("Branch:", branch)) | 106 | vars.append(self.set_vars("Branch:", branch)) |