summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bitbake/lib/toaster/toastergui/templatetags/projecttags.py4
-rw-r--r--bitbake/lib/toaster/toastergui/urls.py3
2 files changed, 3 insertions, 4 deletions
diff --git a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
index c432f59a78..bd398f0012 100644
--- a/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
+++ b/bitbake/lib/toaster/toastergui/templatetags/projecttags.py
@@ -167,8 +167,8 @@ def check_filter_status(options, filter):
167def variable_parent_name(value): 167def variable_parent_name(value):
168 """ filter extended variable names to the parent name 168 """ filter extended variable names to the parent name
169 """ 169 """
170 value=re.sub('_\$.*', '', value) 170 value = re.sub(r'_\$.*', '', value)
171 return re.sub('_[a-z].*', '', value) 171 return re.sub(r'_[a-z].*', '', value)
172 172
173@register.filter 173@register.filter
174def filter_setin_files(file_list, matchstr): 174def filter_setin_files(file_list, matchstr):
diff --git a/bitbake/lib/toaster/toastergui/urls.py b/bitbake/lib/toaster/toastergui/urls.py
index bc3b0c79d8..2c138d3d7d 100644
--- a/bitbake/lib/toaster/toastergui/urls.py
+++ b/bitbake/lib/toaster/toastergui/urls.py
@@ -206,8 +206,7 @@ urlpatterns = [
206 url(r'^js-unit-tests/$', views.jsunittests, name='js-unit-tests'), 206 url(r'^js-unit-tests/$', views.jsunittests, name='js-unit-tests'),
207 207
208 # image customisation functionality 208 # image customisation functionality
209 url(r'^xhr_customrecipe/(?P<recipe_id>\d+)' 209 url(r'^xhr_customrecipe/(?P<recipe_id>\d+)/packages/(?P<package_id>\d+|)$',
210 '/packages/(?P<package_id>\d+|)$',
211 api.XhrCustomRecipePackages.as_view(), 210 api.XhrCustomRecipePackages.as_view(),
212 name='xhr_customrecipe_packages'), 211 name='xhr_customrecipe_packages'),
213 212