summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-20 14:44:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-22 12:03:02 +0000
commite031a05b6d124f7bcaf22c92423c2e47df1d728c (patch)
tree9185e4da9fd4f83471c352eda1b0d22a03c91d1a /meta
parent0d39f3364a1cfb91f8794740ad1b68a9a52e191f (diff)
downloadpoky-e031a05b6d124f7bcaf22c92423c2e47df1d728c.tar.gz
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>
Diffstat (limited to 'meta')
-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):
572 for scm in scms: 572 for scm in scms:
573 ud = urldata[scm] 573 ud = urldata[scm]
574 for name in ud.names: 574 for name in ud.names:
575 rev = ud.method.sortable_revision(scm, ud, d, name) 575 try:
576 rev = ud.method.sortable_revision(ud, d, name)
577 except TypeError:
578 # support old bitbake versions
579 rev = ud.method.sortable_revision(scm, ud, d, name)
576 # Clean this up when we next bump bitbake version 580 # Clean this up when we next bump bitbake version
577 if type(rev) != str: 581 if type(rev) != str:
578 autoinc, rev = rev 582 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() {
756 svnFetcher = bb.fetch2.svn.Svn(d) 756 svnFetcher = bb.fetch2.svn.Svn(d)
757 svnFetcher.urldata_init(ud, d) 757 svnFetcher.urldata_init(ud, d)
758 try: 758 try:
759 pupver = svnFetcher.latest_revision(uri, ud, d, ud.names[0]) 759 pupver = svnFetcher.latest_revision(ud, d, ud.names[0])
760 except bb.fetch2.FetchError: 760 except bb.fetch2.FetchError:
761 pstatus = "ErrSvnAccess" 761 pstatus = "ErrSvnAccess"
762 762