[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7460/8267] devtool: update-recipe: ensure patches get deleted in srcrev mode

[Emmanuele Bassi <ebassi src gnome org>]

commit 24cfac526305e623f368152147497b39cb26044c
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Aug 31 11:54:05 2017 +1200

    devtool: update-recipe: ensure patches get deleted in srcrev mode
    
    Patches that we identify as having been "deleted" (i.e. patches in
    SRC_URI that no longer appear in the git tree) need to be dropped even
    if we're updating in srcrev mode. This fixes the case where HEAD of the
    git tree is valid upstream (i.e. no extra commits), but there are
    patches left over in the recipe, e.g. when we do devtool upgrade and
    then all of the commits rebased on top of the new branch get skipped.
    
    Fixes [YOCTO #11972].
    
    (From OE-Core rev: 350f83dc1e317aeb93539f13966caca6d894f569)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/lib/devtool/standard.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py
index fa9d347..d79ebf1 100644
--- a/scripts/lib/devtool/standard.py
+++ b/scripts/lib/devtool/standard.py
@@ -1352,9 +1352,10 @@ def _update_recipe_srcrev(srctree, rd, appendlayerdir, wildcard_version, no_remo
             old_srcrev = (rd.getVar('SRCREV', False) 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)))
 
             # Remove deleted local files and "overlapping" patches
-            remove_files = list(del_f.values()) + list(upd_p.values())
+            remove_files = list(del_f.values()) + list(upd_p.values()) + list(del_p.values())
             if remove_files:
                 removedentries = _remove_file_entries(srcuri, remove_files)[0]
                 update_srcuri = True