Patchwork buildhistory/distrodata: Adapt to updated fetcher API

login
register
mail settings
Submitter Richard Purdie
Date Nov. 20, 2013, 4:36 p.m.
Message ID <1384965401.16887.72.camel@ted>
Download mbox | patch
Permalink /patch/62035/
State Accepted
Commit e031a05b6d124f7bcaf22c92423c2e47df1d728c
Headers show

Comments

Richard Purdie - Nov. 20, 2013, 4:36 p.m.
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@linuxfoundation.org>
---
[Bitbake changes aren't in yet, this is to prepare for them]

Patch

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"