Skip to contentSkip to conversation

buildhistory: adapt to fetcher changes

RFC PATCH New Martin Jansa 1 participant 1 message May 22, 2013

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 buildhistory: adapt to fetcher changes

* bitbake commit:
commit fb068bee47bb1a06f02447daf16c2b2a79c03288
Author: Richard Purdie <[email protected]>
Date: Sun May 19 13:17:58 2013 +0300

fetch2/git: Clean up sortable_revision

Now we no longer try and provide increasing values from the fetcher, we can simplify the function structure for the sortable_revision pieces and move the AUTOINC handling directly into the function which needs it, simplifying the code.

changed sortable_revision API and now it returns tuple. Maybe we should modify buildhistory to support both variants, this is just quick build-fix.

---
 meta/classes/buildhistory.bbclass | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
meta/classes/buildhistory.bbclass +1 -4
index 3b6ce99..0d74d7c 100644
@@ -547,15 +547,12 @@ def _get_srcrev_values(d):
         if urldata[u].method.supports_srcrev():
             scms.append(u)
 
-    autoinc_templ = 'AUTOINC+'
     dict_srcrevs = {}
     dict_tag_srcrevs = {}
     for scm in scms:
         ud = urldata[scm]
         for name in ud.names:
-            rev = ud.method.sortable_revision(scm, ud, d, name)
-            if rev.startswith(autoinc_templ):
-                rev = rev[len(autoinc_templ):]
+            autoinc, rev = ud.method.sortable_revision(scm, ud, d, name)
             dict_srcrevs[name] = rev
             if 'tag' in ud.parm:
                 tag = ud.parm['tag'];
Signature · 1 line
1.8.2.1