[bitbake-devel] [PATCH] fetch/git: Separate out an ls-remote function
Richard Purdie
richard.purdie at linuxfoundation.org
Fri Feb 28 17:22:54 UTC 2014
There is other code which can want to run ls-remote style commands with
different parameters so split out the function.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
index f7c26b3..1edcee4 100644
--- a/bitbake/lib/bb/fetch2/git.py
+++ b/bitbake/lib/bb/fetch2/git.py
@@ -317,22 +317,30 @@ class Git(FetchMethod):
"""
return "git:" + ud.host + ud.path.replace('/', '.') + ud.unresolvedrev[name]
- def _latest_revision(self, ud, d, name):
+ def __lsremote(self, ud, d, search):
"""
- Compute the HEAD revision for the url
+ Run git ls-remote with the specified search string
"""
if ud.user:
username = ud.user + '@'
else:
username = ""
- cmd = "%s ls-remote %s://%s%s%s refs/heads/%s refs/tags/%s^{}" % \
- (ud.basecmd, ud.proto, username, ud.host, ud.path, ud.unresolvedrev[name], ud.unresolvedrev[name])
+ cmd = "%s ls-remote %s://%s%s%s %s" % \
+ (ud.basecmd, ud.proto, username, ud.host, ud.path, search)
if ud.proto.lower() != 'file':
bb.fetch2.check_network_access(d, cmd)
output = runfetchcmd(cmd, d, True)
if not output:
raise bb.fetch2.FetchError("The command %s gave empty output unexpectedly" % cmd, ud.url)
+ return output
+
+ def _latest_revision(self, ud, d, name):
+ """
+ Compute the HEAD revision for the url
+ """
+ search = "refs/heads/%s refs/tags/%s^{}" % (ud.unresolvedrev[name], ud.unresolvedrev[name])
+ output = self.__lsremote(ud, d, search)
return output.split()[0]
def _build_revision(self, ud, d, name):
More information about the bitbake-devel
mailing list