From 7ae22517940444584ae9b0aae0f4229a8a10e0a6 Mon Sep 17 00:00:00 2001 From: Emilia Ciobanu Date: Tue, 26 Feb 2013 15:35:14 +0200 Subject: distrodata: added some corner cases for svn and git repos distrodata.bbclass: git tags can include only one digit, therefore the regex that matches the latest version should also include this case. For some svn repos, using the http protocol than using the svn protocol to get infomation about revisions works better. (From OE-Core rev: bbf09cc0abbc81419349f2af1bc1196a868b2269) Signed-off-by: Emilia Ciobanu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/distrodata.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/classes/distrodata.bbclass') diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass index 276ca03bb6..bd3a6a96ab 100644 --- a/meta/classes/distrodata.bbclass +++ b/meta/classes/distrodata.bbclass @@ -674,7 +674,7 @@ python do_checkpkg() { if len(line)==0: break; puptag = line.split("/")[-1] - puptag = re.search("[0-9][0-9|\.|_]+[0-9]", puptag) + puptag = re.search("([0-9][\.|_]?)+", puptag) if puptag == None: continue; puptag = puptag.group() @@ -714,6 +714,10 @@ python do_checkpkg() { svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"]) print svncmd svninfo = os.popen(svncmd).read() + if "Can't connect to host " in svninfo or "Connection timed out" in svninfo: + svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), "http", + host, path, parm["module"]) + svninfo = os.popen(svncmd).read() for line in svninfo.split("\n"): if re.search("^Last Changed Rev:", line): pupver = line.split(" ")[-1] -- cgit v1.2.3-54-g00ecf