summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta/classes/buildhistory.bbclass6
-rw-r--r--meta/classes/distrodata.bbclass2
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3da03c8485..ec3f0b173e 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -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
diff --git a/meta/classes/distrodata.bbclass b/meta/classes/distrodata.bbclass
index e4810273b2..2c365f968e 100644
--- a/meta/classes/distrodata.bbclass
+++ b/meta/classes/distrodata.bbclass
@@ -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"