[gnome-continuous-yocto/gnomeostree-3.28-rocko: 8044/8267] devtool: standard: Expand SRCREV before using it in _update_recipe_srcrev



commit ede79dea7c4595e856ac2385a7220565a2d4a00b
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Wed Oct 11 00:01:49 2017 +0200

    devtool: standard: Expand SRCREV before using it in _update_recipe_srcrev
    
    If SRCREV contains a variable reference, any devtool command that
    would try to update it would fail. E.g., if SRCREV = "R${PV}", then
    devtool finish without having committed any changes would fail with:
    
      oe.patch.CmdError: Command Error: 'sh -c 'git format-patch R${PV} -o
      /tmp/oepatchb_doareb -- .'' exited with 0 Output:
      fatal: bad revision 'R'
    
    (From OE-Core rev: 094499c819722ad698ccb64ec65dd439b211c31c)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/standard.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index 14e87b9..beea0d4 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1298,7 +1298,7 @@ def _update_recipe_srcrev(srctree, rd, appendlayerdir, wildcard_version, no_remo
         if not no_remove:
             # Find list of existing patches in recipe file
             patches_dir = tempfile.mkdtemp(dir=tempdir)
-            old_srcrev = (rd.getVar('SRCREV', False) or '')
+            old_srcrev = rd.getVar('SRCREV') or ''
             upd_p, new_p, del_p = _export_patches(srctree, rd, old_srcrev,
                                                   patches_dir)
             logger.debug('Patches: update %s, new %s, delete %s' % (dict(upd_p), dict(new_p), dict(del_p)))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]