summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2018-03-27 16:16:29 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2018-05-04 23:57:53 +1200
commit8b98c0ecdd905395abbc452a2af5453a3faea362 (patch)
tree45073d3c4708416446c1eac6e682ba8e7d658142
parentfb332736c60167aa88de76847efdc94de25e4c44 (diff)
downloadopenembedded-core-contrib-8b98c0ecdd905395abbc452a2af5453a3faea362.tar.gz
openembedded-core-contrib-8b98c0ecdd905395abbc452a2af5453a3faea362.tar.bz2
openembedded-core-contrib-8b98c0ecdd905395abbc452a2af5453a3faea362.zip
rrs_upgrade_history: ignore files outside of the layer
We were parsing recipes that were in the repository but not inside the actual layer we're dealing with (e.g. we have meta-selftest within the OE-Core repository, containing a number of recipes that are only intended for testing purposes and should not be looked at by this script). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--rrs/tools/upgrade_history_internal.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/rrs/tools/upgrade_history_internal.py b/rrs/tools/upgrade_history_internal.py
index 0199640447..dcfd1af4ed 100644
--- a/rrs/tools/upgrade_history_internal.py
+++ b/rrs/tools/upgrade_history_internal.py
@@ -130,6 +130,9 @@ def _get_recipes_filenames(ct, repodir, layerdir, logger):
# Skip deleted files in commit
if not os.path.exists(fullpath):
continue
+ if not fullpath.startswith(layerdir_start):
+ # Ignore files in repo that are outside of the layer
+ continue
(typename, _, filename) = recipeparse.detect_file_type(fullpath,
layerdir_start)
if typename == 'recipe':