buildhistory/distrodata: Adapt to updated fetcher API

The buildhistory code has fallback paths for older bitbakes for now. The
distrodata class is much less used and it can be assumed a recent bitbake
is used in that case rather than adding fallback code.

(From OE-Core rev: 570cc145029fd9d5528aef5c27cb65164265c799)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2013-11-20 14:44:11 +00:00
parent 0d39f3364a
commit e031a05b6d
2 changed files with 6 additions and 2 deletions

View File

@@ -572,7 +572,11 @@ def _get_srcrev_values(d):
for scm in scms:
ud = urldata[scm]
for name in ud.names:
rev = ud.method.sortable_revision(scm, ud, d, name)
try:
rev = ud.method.sortable_revision(ud, d, name)
except TypeError:
# support old bitbake versions
rev = ud.method.sortable_revision(scm, ud, d, name)
# Clean this up when we next bump bitbake version
if type(rev) != str:
autoinc, rev = rev

View File

@@ -756,7 +756,7 @@ python do_checkpkg() {
svnFetcher = bb.fetch2.svn.Svn(d)
svnFetcher.urldata_init(ud, d)
try:
pupver = svnFetcher.latest_revision(uri, ud, d, ud.names[0])
pupver = svnFetcher.latest_revision(ud, d, ud.names[0])
except bb.fetch2.FetchError:
pstatus = "ErrSvnAccess"