diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2011-09-16 09:38:22 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-19 12:31:10 +0100 |
| commit | 3a54dcc09a12406ec6cf22b4b1a2cc4fc203822c (patch) | |
| tree | 60376be32c22715f7213ff41dbb1184b245d9a3e /lib | |
| parent | 9de432fe2348cdbc93037bb49abb508d1fd38336 (diff) | |
| download | bitbake-3a54dcc09a12406ec6cf22b4b1a2cc4fc203822c.tar.gz | |
fetch2/git: be more carefull in _contains_ref when checking git log output
* in some cases there could be output like this
ERROR: ld.so: object 'libpseudo.so' from LD_PRELOAD cannot be preloaded: ignored.
before wc -l output and returned 'output.split()[0] != 0' is always True
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/fetch2/git.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 26236b81b..4a4c30d5e 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -239,7 +239,10 @@ class Git(FetchMethod): def _contains_ref(self, tag, d): basecmd = data.getVar("FETCHCMD_git", d, True) or "git" - output = runfetchcmd("%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag), d, quiet=True) + cmd = "%s log --pretty=oneline -n 1 %s -- 2> /dev/null | wc -l" % (basecmd, tag) + output = runfetchcmd(cmd, d, quiet=True) + if len(output.split()) > 1: + raise bb.fetch2.FetchError("The command '%s' gave output with more then 1 line unexpectedly, output: '%s'" % (cmd, output)) return output.split()[0] != "0" def _revision_key(self, url, ud, d, name): |