[bitbake-devel] [PATCH 1/6] toaster: rename bldviewer projecttags custom tagset

Alex DAMIAN alexandru.damian at intel.com
Thu Sep 4 16:45:12 UTC 2014


From: Alexandru DAMIAN <alexandru.damian at intel.com>

We rename the projecttags in bldviewer.templatetags to
simple_projecttags in order to avoid conflict with the
similarly named tagset in toastergui.

The conflict leads to an intermittent bug where proper
tags are not read correctly since Django uses only the
module name as global tag library identificator.

Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
 lib/toaster/bldviewer/templates/simple_build.html                       | 2 +-
 lib/toaster/bldviewer/templates/simple_layer.html                       | 2 +-
 lib/toaster/bldviewer/templates/simple_recipe.html                      | 2 +-
 .../bldviewer/templatetags/{projecttags.py => simple_projecttags.py}    | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename lib/toaster/bldviewer/templatetags/{projecttags.py => simple_projecttags.py} (100%)

diff --git a/lib/toaster/bldviewer/templates/simple_build.html b/lib/toaster/bldviewer/templates/simple_build.html
index a6983f5..230e7c2 100644
--- a/lib/toaster/bldviewer/templates/simple_build.html
+++ b/lib/toaster/bldviewer/templates/simple_build.html
@@ -6,7 +6,7 @@
 
 {% block pagetable %}
 
-    {% load projecttags %}
+    {% load simple_projecttags %}
         <tr>
             <th>Outcome</th>
             <th>Started On</th>
diff --git a/lib/toaster/bldviewer/templates/simple_layer.html b/lib/toaster/bldviewer/templates/simple_layer.html
index ae7172d..25e7bf8 100644
--- a/lib/toaster/bldviewer/templates/simple_layer.html
+++ b/lib/toaster/bldviewer/templates/simple_layer.html
@@ -5,7 +5,7 @@
 {% endblock %}
 
 {% block pagetable %}
-    {% load projecttags %}
+    {% load simple_projecttags %}
 
         <tr>
             <th>Name</th>
diff --git a/lib/toaster/bldviewer/templates/simple_recipe.html b/lib/toaster/bldviewer/templates/simple_recipe.html
index 77b9de2..3bff3b9a 100644
--- a/lib/toaster/bldviewer/templates/simple_recipe.html
+++ b/lib/toaster/bldviewer/templates/simple_recipe.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block pagetable %}
-    {% load projecttags %}
+    {% load simple_projecttags %}
 
         <tr>
         </tr>
diff --git a/lib/toaster/bldviewer/templatetags/projecttags.py b/lib/toaster/bldviewer/templatetags/simple_projecttags.py
similarity index 100%
rename from lib/toaster/bldviewer/templatetags/projecttags.py
rename to lib/toaster/bldviewer/templatetags/simple_projecttags.py
-- 
1.9.1




More information about the bitbake-devel mailing list