diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index d4715fa67b..7e51014b7d 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -87,8 +87,8 @@ BBBASEDIR=`dirname ${BASH_SOURCE}`/.. # Verify prerequisites -if ! echo "import django; print (1,4,5) == django.VERSION[0:3]" | python 2>/dev/null | grep True >/dev/null; then - echo -e "This program needs Django 1.4.5. Please install with\n\nsudo pip install django==1.4.5" +if ! echo "import django; print (1,5) == django.VERSION[0:2]" | python 2>/dev/null | grep True >/dev/null; then + echo -e "This program needs Django 1.5. Please install with\n\nsudo pip install django==1.5" return 2 fi diff --git a/bitbake/lib/toaster/bldviewer/templates/base.html b/bitbake/lib/toaster/bldviewer/templates/base.html index 101880d3ea..d58cbeaed5 100644 --- a/bitbake/lib/toaster/bldviewer/templates/base.html +++ b/bitbake/lib/toaster/bldviewer/templates/base.html @@ -14,8 +14,8 @@
diff --git a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html index 873f271bab..d590f28bc5 100644 --- a/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html +++ b/bitbake/lib/toaster/bldviewer/templates/basebuildpage.html @@ -3,14 +3,14 @@ {% block pagename %}

Toaster - Build {% block pagetitle %} {% endblock %}

{% endblock %} diff --git a/bitbake/lib/toaster/bldviewer/templates/bpackage.html b/bitbake/lib/toaster/bldviewer/templates/bpackage.html index ca092ca6a0..07d079298e 100644 --- a/bitbake/lib/toaster/bldviewer/templates/bpackage.html +++ b/bitbake/lib/toaster/bldviewer/templates/bpackage.html @@ -21,9 +21,9 @@ {% for package in packages %} - {{package.name}} ({{package.filelist_bpackage.count}} files) + {{package.name}} ({{package.filelist_bpackage.count}} files) {{package.version}}-{{package.revision}} - {%if package.recipe%}{{package.recipe.name}}{{package.package_name}}{%endif%} + {{package.recipe.name}}{{package.package_name}} {{package.summary}} {{package.section}} diff --git a/bitbake/lib/toaster/bldviewer/templates/build.html b/bitbake/lib/toaster/bldviewer/templates/build.html index 5f623504d5..5653cca357 100644 --- a/bitbake/lib/toaster/bldviewer/templates/build.html +++ b/bitbake/lib/toaster/bldviewer/templates/build.html @@ -23,10 +23,10 @@ {% for build in builds %} - {{build.get_outcome_display}} + {{build.get_outcome_display}} {{build.started_on}} {{build.completed_on}} - {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} + {% for t in build.target_set.all %}{%if t.is_image %}{% endif %}{{t.target}}{% if t.is_image %}{% endif %}
{% endfor %} {{build.machine}} {% time_difference build.started_on build.completed_on %} {{build.errors_no}}:{% if build.errors_no %}{% for error in logs %}{% if error.build == build %}{% if error.level == 2 %}

{{error.message}}

{% endif %}{% endif %}{% endfor %}{% else %}None{% endif %} diff --git a/bitbake/lib/toaster/bldviewer/templates/layer.html b/bitbake/lib/toaster/bldviewer/templates/layer.html index fa4fd9bde8..c5034dea83 100644 --- a/bitbake/lib/toaster/bldviewer/templates/layer.html +++ b/bitbake/lib/toaster/bldviewer/templates/layer.html @@ -23,7 +23,7 @@ {% for lv in layer.versions %} {% endfor %}
- ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes) + ({{lv.priority}}){{lv.branch}}:{{lv.commit}} ({{lv.count}} recipes)
diff --git a/bitbake/lib/toaster/bldviewer/templates/package.html b/bitbake/lib/toaster/bldviewer/templates/package.html index b1246e788a..fda9dab0f0 100644 --- a/bitbake/lib/toaster/bldviewer/templates/package.html +++ b/bitbake/lib/toaster/bldviewer/templates/package.html @@ -20,7 +20,7 @@ {{package.version}} {{package.size}} {%if package.recipe %} - {{package.recipe.name}}{{package.package_name}}{%endif%} + {{package.recipe.name}}{{package.package_name}}{%endif%}
{% for d in package.package_dependencies_source.all %} diff --git a/bitbake/lib/toaster/bldviewer/templates/task.html b/bitbake/lib/toaster/bldviewer/templates/task.html index e7253698cd..5d9887e848 100644 --- a/bitbake/lib/toaster/bldviewer/templates/task.html +++ b/bitbake/lib/toaster/bldviewer/templates/task.html @@ -28,7 +28,7 @@ {{task.order}} - {{task.recipe.name}}.{{task.task_name}} + {{task.recipe.name}}.{{task.task_name}} {{task.recipe.version}} {% if task.task_executed %} diff --git a/bitbake/lib/toaster/bldviewer/urls.py b/bitbake/lib/toaster/bldviewer/urls.py index becc679203..b84c95f08b 100644 --- a/bitbake/lib/toaster/bldviewer/urls.py +++ b/bitbake/lib/toaster/bldviewer/urls.py @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.conf.urls import patterns, include, url -from django.views.generic.simple import redirect_to +from django.views.generic import RedirectView urlpatterns = patterns('bldviewer.views', url(r'^builds/$', 'build', name='all-builds'), @@ -28,5 +28,5 @@ urlpatterns = patterns('bldviewer.views', url(r'^build/(?P\d+)/configuration/$', 'configuration', name='configuration'), url(r'^layers/$', 'layer', name='all-layers'), url(r'^layerversions/(?P\d+)/recipes/.*$', 'layer_versions_recipes', name='layer_versions_recipes'), - url(r'^$', redirect_to, {'url': 'builds/'}), + url(r'^$', RedirectView.as_view( url= 'builds/')), ) diff --git a/bitbake/lib/toaster/toastermain/urls.py b/bitbake/lib/toaster/toastermain/urls.py index d0606bce9e..a696a0b216 100644 --- a/bitbake/lib/toaster/toastermain/urls.py +++ b/bitbake/lib/toaster/toastermain/urls.py @@ -17,7 +17,7 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. from django.conf.urls import patterns, include, url -from django.views.generic.simple import redirect_to +from django.views.generic import RedirectView from django.views.decorators.cache import never_cache @@ -29,7 +29,7 @@ urlpatterns = patterns('', url(r'^simple/', include('bldviewer.urls')), url(r'^api/1.0/', include('bldviewer.api')), url(r'^gui/', include('toastergui.urls')), - url(r'^$', never_cache(redirect_to), {'url': '/simple/'}), + url(r'^$', never_cache(RedirectView.as_view(url='/simple/'))), # Examples: # url(r'^toaster/', include('toaster.foo.urls')),