summaryrefslogtreecommitdiff
path: root/meta/classes/distrodata.bbclass
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:14:39 +0000
commitbbf09cc0abbc81419349f2af1bc1196a868b2269 (patch)
treef54d67ee0da0d9a599f449fd3cdcc46ff40265af /meta/classes/distrodata.bbclass
parent7fc7e98801bd72b9662528f94b315749e6075666 (diff)
downloadopenembedded-core-bbf09cc0abbc81419349f2af1bc1196a868b2269.tar.gz
openembedded-core-bbf09cc0abbc81419349f2af1bc1196a868b2269.tar.bz2
openembedded-core-bbf09cc0abbc81419349f2af1bc1196a868b2269.zip
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. Signed-off-by: Emilia Ciobanu <emilia.maria.silvia.ciobanu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/classes/distrodata.bbclass')
-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() {
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]