From 28c3aa8b85dac016d38a83dc17b46e0ac76c1caa Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Fri, 16 Sep 2011 09:38:22 +0200 Subject: 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 (Bitbake rev: 3a54dcc09a12406ec6cf22b4b1a2cc4fc203822c) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- bitbake/lib/bb/fetch2/git.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index 26236b81bc..4a4c30d5e4 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/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): -- cgit v1.2.3-54-g00ecf