diff options
Diffstat (limited to 'bitbake/lib/toaster/toastergui/views.py')
-rw-r--r-- | bitbake/lib/toaster/toastergui/views.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/toaster/toastergui/views.py b/bitbake/lib/toaster/toastergui/views.py index 4ed99400c8..78726a88bc 100644 --- a/bitbake/lib/toaster/toastergui/views.py +++ b/bitbake/lib/toaster/toastergui/views.py | |||
@@ -1154,17 +1154,17 @@ def configvars(request, build_id): | |||
1154 | 1154 | ||
1155 | variables = _build_page_range(Paginator(queryset, request.GET.get('count', 50)), request.GET.get('page', 1)) | 1155 | variables = _build_page_range(Paginator(queryset, request.GET.get('count', 50)), request.GET.get('page', 1)) |
1156 | 1156 | ||
1157 | # show all matching files (not just the last one) | ||
1157 | file_filter= search_term + ":" | 1158 | file_filter= search_term + ":" |
1158 | if filter_string.find('conf/local.conf') > 0: | 1159 | if filter_string.find('/conf/') > 0: |
1159 | file_filter += 'conf/local.conf' | 1160 | file_filter += 'conf/(local|bblayers).conf' |
1160 | if filter_string.find('conf/bblayers.conf') > 0: | ||
1161 | file_filter += 'conf/bblayers.conf' | ||
1162 | if filter_string.find('conf/machine/') > 0: | 1161 | if filter_string.find('conf/machine/') > 0: |
1163 | file_filter += 'conf/machine/' | 1162 | file_filter += 'conf/machine/' |
1164 | if filter_string.find('conf/distro/') > 0: | 1163 | if filter_string.find('conf/distro/') > 0: |
1165 | file_filter += 'conf/distro/' | 1164 | file_filter += 'conf/distro/' |
1166 | if filter_string.find('/bitbake.conf') > 0: | 1165 | if filter_string.find('/bitbake.conf') > 0: |
1167 | file_filter += '/bitbake.conf' | 1166 | file_filter += '/bitbake.conf' |
1167 | build_dir=re.sub("/tmp/log/.*","",Build.objects.filter(pk=build_id)[0].cooker_log_path) | ||
1168 | 1168 | ||
1169 | context = { | 1169 | context = { |
1170 | 'objectname': 'configvars', | 1170 | 'objectname': 'configvars', |
@@ -1193,7 +1193,7 @@ def configvars(request, build_id): | |||
1193 | 'class' : 'vhistory__file_name', | 1193 | 'class' : 'vhistory__file_name', |
1194 | 'label': 'Show:', | 1194 | 'label': 'Show:', |
1195 | 'options' : [ | 1195 | 'options' : [ |
1196 | ('Local configuration variables', 'vhistory__file_name__regex:conf/(local|bblayers).conf', queryset_with_search.filter(vhistory__file_name__regex='conf/(local|bblayers).conf').count(), 'Select this filter to see variables set by the <code>local.conf</code> and <code>bblayers.conf</code> configuration files inside the <code>/build/conf/</code> directory'), | 1196 | ('Local configuration variables', 'vhistory__file_name__contains:'+build_dir+'/conf/',queryset_with_search.filter(vhistory__file_name__contains=build_dir+'/conf/').count(), 'Select this filter to see variables set by the <code>local.conf</code> and <code>bblayers.conf</code> configuration files inside the <code>/build/conf/</code> directory'), |
1197 | ('Machine configuration variables', 'vhistory__file_name__contains:conf/machine/',queryset_with_search.filter(vhistory__file_name__contains='conf/machine').count(), 'Select this filter to see variables set by the configuration file(s) inside your layers <code>/conf/machine/</code> directory'), | 1197 | ('Machine configuration variables', 'vhistory__file_name__contains:conf/machine/',queryset_with_search.filter(vhistory__file_name__contains='conf/machine').count(), 'Select this filter to see variables set by the configuration file(s) inside your layers <code>/conf/machine/</code> directory'), |
1198 | ('Distro configuration variables', 'vhistory__file_name__contains:conf/distro/',queryset_with_search.filter(vhistory__file_name__contains='conf/distro').count(), 'Select this filter to see variables set by the configuration file(s) inside your layers <code>/conf/distro/</code> directory'), | 1198 | ('Distro configuration variables', 'vhistory__file_name__contains:conf/distro/',queryset_with_search.filter(vhistory__file_name__contains='conf/distro').count(), 'Select this filter to see variables set by the configuration file(s) inside your layers <code>/conf/distro/</code> directory'), |
1199 | ('Layer configuration variables', 'vhistory__file_name__contains:conf/layer.conf',queryset_with_search.filter(vhistory__file_name__contains='conf/layer.conf').count(), 'Select this filter to see variables set by the <code>layer.conf</code> configuration file inside your layers'), | 1199 | ('Layer configuration variables', 'vhistory__file_name__contains:conf/layer.conf',queryset_with_search.filter(vhistory__file_name__contains='conf/layer.conf').count(), 'Select this filter to see variables set by the <code>layer.conf</code> configuration file inside your layers'), |