diff options
author | Marcin SmoczyĆski <marcin.smoczynski@enigma.com.pl> | 2015-04-02 14:24:51 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-28 09:37:58 +0100 |
commit | cb8224f0c73c06879783665e2de39ecca7f6a350 (patch) | |
tree | dc29a6f4771137324ea12699ab27419fea34530f | |
parent | cd92e5dce5f5d61ecb7838bf964a7812e905509a (diff) | |
download | bitbake-cb8224f0c73c06879783665e2de39ecca7f6a350.tar.gz |
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]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | lib/bb/fetch2/git.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 0fd9beee1..ac9d86893 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -395,9 +395,8 @@ class Git(FetchMethod): return ud.revisions[name] def checkstatus(self, ud, d): - fetchcmd = "%s ls-remote %s" % (ud.basecmd, ud.url) try: - runfetchcmd(fetchcmd, d, quiet=True) + self._lsremote(ud, d, "") return True except FetchError: return False |