From c1bce2795fdc9fbc3ebb1630ece6f06b22f7cba7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Mon, 30 May 2016 14:28:12 +1200 Subject: [PATCH] Fix listing *_git.bbappend as appends for git recipe Fix a greedy regex in the recipe detail view resulting in the git recipe listing all bbappends named *_git.bbappend as its bbappends (quite a few in the public instance). Signed-off-by: Paul Eggleton --- TODO | 1 - layerindex/views.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TODO b/TODO index 2d5a53d..9ab7aa7 100644 --- a/TODO +++ b/TODO @@ -10,7 +10,6 @@ TODO: * Make it easy to update people's email addresses Bugs -* git recipe shows up all _git bbappends: http://layers.openembedded.org/layerindex/recipe/5542/ * Duplication of first maintainer when editing to add a second? * PROVIDES column appears to be too short for some recipes diff --git a/layerindex/views.py b/layerindex/views.py index d033046..d9480c9 100644 --- a/layerindex/views.py +++ b/layerindex/views.py @@ -672,7 +672,7 @@ class RecipeDetailView(DetailView): verappendprefix = recipe.filename.split('.bb')[0] appendprefix = verappendprefix.split('_')[0] #context['verappends'] = BBAppend.objects.filter(layerbranch__branch=recipe.layerbranch.branch).filter(filename='%s.bbappend' % verappendprefix) - context['appends'] = BBAppend.objects.filter(layerbranch__branch=recipe.layerbranch.branch).filter(filename__regex=r'%s(_[^_]*)?\.bbappend' % appendprefix) + context['appends'] = BBAppend.objects.filter(layerbranch__branch=recipe.layerbranch.branch).filter(filename__regex=r'^%s(_[^_]*)?\.bbappend' % appendprefix) verappends = [] for append in context['appends']: if append.matches_recipe(recipe):