diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-28 17:22:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-02 17:25:29 +0000 |
commit | 1aab9c797d4743f13682c6472e21da0a536056e6 (patch) | |
tree | 2b4115e129bd127f27771da6c2bfef6d9bacd362 | |
parent | 4b048ac882a265e0da73faeac31cedba96c4a811 (diff) | |
download | poky-1aab9c797d4743f13682c6472e21da0a536056e6.tar.gz |
bitbake: fetch/git: Separate out an ls-remote function
There is other code which can want to run ls-remote style commands with
different parameters so split out the function.
(Bitbake rev: 13f1138f5504feee0ee8e8f3a0675d0bea490351)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | bitbake/lib/bb/fetch2/git.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py index f7c26b36cc..9ca24428a1 100644 --- a/bitbake/lib/bb/fetch2/git.py +++ b/bitbake/lib/bb/fetch2/git.py | |||
@@ -317,22 +317,30 @@ class Git(FetchMethod): | |||
317 | """ | 317 | """ |
318 | return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] | 318 | return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name] |
319 | 319 | ||
320 | def _latest_revision(self, ud, d, name): | 320 | def _lsremote(self, ud, d, search): |
321 | """ | 321 | """ |
322 | Compute the HEAD revision for the url | 322 | Run git ls-remote with the specified search string |
323 | """ | 323 | """ |
324 | if ud.user: | 324 | if ud.user: |
325 | username = ud.user + '@' | 325 | username = ud.user + '@' |
326 | else: | 326 | else: |
327 | username = "" | 327 | username = "" |
328 | 328 | ||
329 | cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s^{}" % \ | 329 | cmd = "%s ls-remote %s://%s%s%s %s" % \ |
330 | (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.unresolvedrev[name], ud.unresolvedrev[name]) | 330 | (ud.basecmd, ud.proto, username, ud.host, ud.path, search) |
331 | if ud.proto.lower() != 'file': | 331 | if ud.proto.lower() != 'file': |
332 | bb.fetch2.check_network_access(d, cmd) | 332 | bb.fetch2.check_network_access(d, cmd) |
333 | output = runfetchcmd(cmd, d, True) | 333 | output = runfetchcmd(cmd, d, True) |
334 | if not output: | 334 | if not output: |
335 | raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url) | 335 | raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url) |
336 | return output | ||
337 | |||
338 | def _latest_revision(self, ud, d, name): | ||
339 | """ | ||
340 | Compute the HEAD revision for the url | ||
341 | """ | ||
342 | search = "refs/heads/%s refs/tags/%s^{}" % (ud.unresolvedrev[name], ud.unresolvedrev[name]) | ||
343 | output = self._lsremote(ud, d, search) | ||
336 | return output.split()[0] | 344 | return output.split()[0] |
337 | 345 | ||
338 | def _build_revision(self, ud, d, name): | 346 | def _build_revision(self, ud, d, name): |