Patchwork [bitbake-devel,v2] hob/builddetailspage: change branch field

login
register
mail settings
Submitter Cristiana Voicu
Date Sept. 26, 2012, 1:11 p.m.
Message ID <1348665101-12673-1-git-send-email-cristiana.voicu@intel.com>
Download mbox | patch
Permalink /patch/37281/
State New
Headers show

Comments

Cristiana Voicu - Sept. 26, 2012, 1:11 p.m.
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]

Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
---
 bitbake/lib/bb/ui/crumbs/builddetailspage.py |    2 ++
 1 file changed, 2 insertions(+)
Richard Purdie - Sept. 27, 2012, 3:43 p.m.
On Wed, 2012-09-26 at 16:11 +0300, Cristiana Voicu wrote:
> 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]
> 
> Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com>
> ---
>  bitbake/lib/bb/ui/crumbs/builddetailspage.py |    2 ++
>  1 file changed, 2 insertions(+)

Merged to master, thanks.

Richard

Patch

diff --git a/bitbake/lib/bb/ui/crumbs/builddetailspage.py b/bitbake/lib/bb/ui/crumbs/builddetailspage.py
index a927c21..65b421c 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):
             import os, os.path
             if os.path.exists(path):
                 branch = bb.process.run('cd %s; git branch | grep "^* " | tr -d "* "' % path)[0]
+                if branch.startswith("fatal:"):
+                    branch = "(unknown)"
                 if branch:
                     branch = branch.strip('\n')
                     vars.append(self.set_vars("Branch:", branch))