From 20a420ec9c42ece5814ee306309d9a3bdb2cf882 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 3 Sep 2019 16:33:03 +1200 Subject: [PATCH] RRS: handle when recipes get deleted and later re-added We need to capture the re-addition properly or the recipe simply won't show up in the recipe list. Examples from meta-oe: * psqlodbc removed in ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 and added back in 16a6fee6c0455863ed5df15afc49efe8cc617d9c * libgxim removed in 5dd01c5175f518658d8ee5627ede4f593111b872 and added back in af602920594a9cc2e9b397fe311fda7f531be7f3 Signed-off-by: Paul Eggleton --- rrs/tools/upgrade_history_internal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rrs/tools/upgrade_history_internal.py b/rrs/tools/upgrade_history_internal.py index 7fdb564..a14ac0d 100644 --- a/rrs/tools/upgrade_history_internal.py +++ b/rrs/tools/upgrade_history_internal.py @@ -254,7 +254,7 @@ def _create_upgrade(recipe_data, layerbranch, ct, title, info, filepath, logger, if npv == 'git': logger.debug("%s: Avoiding upgrade to unversioned git." % pn) - elif ppv == 'git' or vercmp_result != 0: + elif ppv == 'git' or vercmp_result != 0 or latest_upgrade.upgrade_type == 'R': if initial is True: logger.debug("%s: Update initial upgrade ( -> %s)." % \ (pn, pv))