summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorMarcin SmoczyƄski <marcin.smoczynski@enigma.com.pl>2015-04-02 14:24:51 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-19 22:09:36 +0100
commit7310c3c925282e52b44351a5dfd7f7d882d2dcc4 (patch)
tree9c95b7ad670b0a289fbffb9207f0e634b24a798b /bitbake/lib
parent8b8859a8fee709a808b4cbb8ed126b8f7e1eafa9 (diff)
downloadpoky-7310c3c925282e52b44351a5dfd7f7d882d2dcc4.tar.gz
bitbake: fetch/git: Fix uri in git checkstatus
Pass proper repository url without arguments after a semicolon. Executing checkuri on a rule with git repository in SRC_URI does not report errors when working offline because wrong repository url is passed to the ls-remote command. For example "bitbake -c checkuri glibc" command executes: "git -c core.fsyncobjectfiles=0 ls-remote git://sourceware.org/git/glibc.git;branch=release/2.21/master" command in a shell subprocess to determine if url is valid. Shell subprocess executes in fact 2 commands: "git -c core.fsyncobjectfiles=0 ls-remote git://sourceware.org/git/glibc.git" and "branch=release/2.21/master" First one returns 127 or 128 depending on error but second one returns 0 because it is just env variable setup. Therefore we're not catching connection error. [YOCTO #7558] (Bitbake rev: efa44d04137977f883db4a643b0f774e91514722) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/fetch2/git.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index 2643cda786..45bdec0553 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -399,9 +399,8 @@ class Git(FetchMethod):
399 return ud.revisions[name] 399 return ud.revisions[name]
400 400
401 def checkstatus(self, ud, d): 401 def checkstatus(self, ud, d):
402 fetchcmd = "%s ls-remote %s" % (ud.basecmd, ud.url)
403 try: 402 try:
404 runfetchcmd(fetchcmd, d, quiet=True) 403 self._lsremote(ud, d, "")
405 return True 404 return True
406 except FetchError: 405 except FetchError:
407 return False 406 return False