summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorEmilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com>2013-02-26 15:35:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-02-28 23:15:46 +0000
commit7ae22517940444584ae9b0aae0f4229a8a10e0a6 (patch)
tree213c84ce69dd546e1babc542876ccce7f558e2e0 /meta
parent4926276d51d92c831381a2536f77fef8c58274d1 (diff)
downloadpoky-7ae22517940444584ae9b0aae0f4229a8a10e0a6.tar.gz
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 <emilia.maria.silvia.ciobanu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/distrodata.bbclass6
1 files changed, 5 insertions, 1 deletions
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() {
674 if len(line)==0: 674 if len(line)==0:
675 break; 675 break;
676 puptag = line.split("/")[-1] 676 puptag = line.split("/")[-1]
677 puptag = re.search("[0-9][0-9|\.|_]+[0-9]", puptag) 677 puptag = re.search("([0-9][\.|_]?)+", puptag)
678 if puptag == None: 678 if puptag == None:
679 continue; 679 continue;
680 puptag = puptag.group() 680 puptag = puptag.group()
@@ -714,6 +714,10 @@ python do_checkpkg() {
714 svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"]) 714 svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), svnproto, host, path, parm["module"])
715 print svncmd 715 print svncmd
716 svninfo = os.popen(svncmd).read() 716 svninfo = os.popen(svncmd).read()
717 if "Can't connect to host " in svninfo or "Connection timed out" in svninfo:
718 svncmd = "svn info %s %s://%s%s/%s/ 2>&1" % (" ".join(options), "http",
719 host, path, parm["module"])
720 svninfo = os.popen(svncmd).read()
717 for line in svninfo.split("\n"): 721 for line in svninfo.split("\n"):
718 if re.search("^Last Changed Rev:", line): 722 if re.search("^Last Changed Rev:", line):
719 pupver = line.split(" ")[-1] 723 pupver = line.split(" ")[-1]