[yocto] [auh][PATCH 04/20] upgradehelper.py: support updates to a new vcs revision.

Alexander Kanavin alexander.kanavin at linux.intel.com
Thu Dec 14 08:35:44 PST 2017


From: Alexander Kanavin <alex.kanavin at gmail.com>

Devtool has support for this, and it's useful when the upstream
never issues new versions; in this situation we can simply
attempt to update to the latest revision.

Signed-off-by: Alexander Kanavin <alex.kanavin at gmail.com>
---
 upgradehelper.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/upgradehelper.py b/upgradehelper.py
index 5fb65cd..c11993a 100755
--- a/upgradehelper.py
+++ b/upgradehelper.py
@@ -526,13 +526,14 @@ class Updater(object):
         pkgs_ctx = {}
 
         I(" ########### The list of recipes to be upgraded #############")
-        for p, v, m in pkgs_to_upgrade:
-            I(" %s, %s, %s" % (p, v, m))
+        for p, v, m, r in pkgs_to_upgrade:
+            I(" %s, %s, %s, %s" % (p, v, m, r))
 
             pkgs_ctx[p] = {}
             pkgs_ctx[p]['PN'] = p
             pkgs_ctx[p]['NPV'] = v
             pkgs_ctx[p]['MAINTAINER'] = m
+            pkgs_ctx[p]['NSRCREV'] = r
 
             pkgs_ctx[p]['base_dir'] = self.uh_recipes_all_dir
         I(" ############################################################")
@@ -555,7 +556,7 @@ class Updater(object):
         succeeded_pkgs_ctx = []
         failed_pkgs_ctx = []
         attempted_pkgs = 0
-        for pn, _, _ in pkgs_to_upgrade:
+        for pn, _, _, _ in pkgs_to_upgrade:
             pkg_ctx = pkgs_ctx[pn]
             pkg_ctx['error'] = None
 
@@ -738,11 +739,12 @@ class UniverseUpdater(Updater):
                 cur_ver = row[1]
                 next_ver = row[2]
                 status = row[11]
+                revision = row[12]
                 maintainer = row[14]
                 no_upgrade_reason = row[15]
 
                 if status == 'UPDATE' and not no_upgrade_reason:
-                    pkgs_list.append((pn, next_ver, maintainer))
+                    pkgs_list.append((pn, next_ver, maintainer, revision))
                 else:
                     if no_upgrade_reason:
                         D(" Skip package %s (status = %s, current version = %s," \
-- 
2.15.0




More information about the yocto mailing list