[oe-commits] Richard Purdie : buildhistory/distrodata: Adapt to updated fetcher API
git at git.openembedded.org
git at git.openembedded.org
Thu Nov 21 17:32:28 UTC 2013
Module: openembedded-core.git
Branch: master-next
Commit: 570cc145029fd9d5528aef5c27cb65164265c799
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=570cc145029fd9d5528aef5c27cb65164265c799
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Wed Nov 20 14:44:11 2013 +0000
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.
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/buildhistory.bbclass | 6 +++++-
meta/classes/distrodata.bbclass | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index 3da03c8..ec3f0b1 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 e481027..2c365f9 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"
More information about the Openembedded-commits
mailing list