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

distrodata.bbclass: Add fetch2 handlers to svn case in checkpkg 

The existing code in checkpkg from distrodata.bbclass had similar
functionality with fetch when searching for latest package version.

For packages that use svn protocol that part was rewrote in order
to use fetcher API.
It now calls latest_revision method from Svn class in fetch2 so
that it gets latest version.

[ YOCTO #1813 ]

(From OE-Core rev: 2686b92bbab88cc777fdc0e4dded5aeabca7ac77)

Signed-off-by: Irina Patru <irina.patru@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:
Irina Patru 2013-11-14 10:54:19 +02:00 committed by Richard Purdie
parent 1c0c6dc9d5
commit f2ed8fa276
1 changed files with 17 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta/classes/distrodata.bbclass
View File

@ -751,34 +751,25 @@ python do_checkpkg() {
if not tmp3:
bb.plain("#DEBUG# Package %s: current version (%s) doesn't match the usual pattern" %(pname, pversion))
elif type == 'svn':
options = []
if user:
options.append("--username %s" % user)
if pswd:
options.append("--password %s" % pswd)
svnproto = 'svn'
if 'proto' in parm:
svnproto = parm['proto']
if 'rev' in parm:
pcurver = parm['rev']
ud = bb.fetch2.FetchData(uri, d)
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]
if pupver in pversion:
pstatus = "MATCH"
else:
pstatus = "UPDATE"
if re.match("Err", pstatus):
svnFetcher = bb.fetch2.svn.Svn(d)
svnFetcher.urldata_init(ud, d)
try:
pupver = svnFetcher.latest_revision(uri, ud, d, ud.names[0])
except bb.fetch2.FetchError:
pstatus = "ErrSvnAccess"
if pupver:
if pupver in pversion:
pstatus = "MATCH"
else:
pstatus = "UPDATE"
else:
pstatus = "ErrSvnAccess"
if 'rev' in ud.parm:
pcurver = ud.parm['rev']
if pstatus != "ErrSvnAccess":
tag = pversion.rsplit("+svn")[0]