diff options
| -rw-r--r-- | meta/classes/distrodata.bbclass | 6 |
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] |
