sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Emilia Ciobanu 2013-02-26 15:35:14 +02:00 committed by Richard Purdie
parent 4926276d51
commit 7ae2251794
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
meta/classes/distrodata.bbclass
View File

@ -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]