[U-Boot] Buildman problem

[Masahiro YAMADA]

Hi Simon,


I found an error of buildman.

If the target branch has an upstream branch,
buildman fails with the following message:



$ git branch --set-upstream-to=base
Branch testtest set up to track local branch base.
$ tools/buildman/buildman -b testtest  uniphier
Traceback (most recent call last):
  File "tools/buildman/buildman", line 64, in <module>
    ret_code = control.DoBuildman(options, args)
  File "/home/masahiro/workspace/u-boot-uniphier/tools/buildman/control.py",
line 152, in DoBuildman
    options.branch)
  File "/home/masahiro/workspace/u-boot-uniphier/tools/buildman/../patman/gitutil.py",
line 185, in CountCommitsInBranch
    range_expr, msg = GetRangeInBranch(git_dir, branch, include_upstream)
  File "/home/masahiro/workspace/u-boot-uniphier/tools/buildman/../patman/gitutil.py",
line 151, in GetRangeInBranch
    upstream, msg = GetUpstream(git_dir, branch)
ValueError: too many values to unpack



Is it no longer available
to specify the upstream branch explicitly?





The first bad commit is:


commit 2a9e2c6a0962cb04a12d833cc5c1c0920fa3b4f5
Author: Simon Glass <sjg at chromium.org>
Date:   Mon Dec 1 17:33:54 2014 -0700

    buildman: Try to guess the upstream commit

    Buildman normally obtains the upstream commit by asking git. Provided that
    the branch was created with 'git checkout -b <branch> <some_upstream>' then
    this normally works.

    When there is no upstream, we can try to guess one, by looking up through
    the commits until we find a branch. Add a function to try this and print
    a warning if buildman ends up relying on it.

    Also update the documentation to match.

    Signed-off-by: Simon Glass <sjg at chromium.org>
    Suggested-by: Wolfgang Denk <wd at denx.de>





-- 
Best Regards
Masahiro Yamada