1/2] layerindex/tools/import_layer.py: Fix Openembedded VCS URL
PATCH 1/1 1/2] layerindex/tools/import_layer.py: Fix Openembedded VCS URL
Since Openembedded cgit was upgrade so point to new url to reflect the real URL.
Signed-off-by Aníbal Limón <[email protected]>
--- layerindex/tools/import_layer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
layerindex/tools/import_layer.py +3 -3
@@ -28,9 +28,9 @@ def set_vcs_fields(layer, repoval): layer.vcs_url = repoval if repoval.startswith('git://git.openembedded.org/'): reponame = re.sub('^.*/', '', repoval) - layer.vcs_web_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame - layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%' - layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/cgit.cgi/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_url = 'http://cgit.openembedded.org/' + reponame + layer.vcs_web_tree_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' + layer.vcs_web_file_base_url = 'http://cgit.openembedded.org/' + reponame + '/tree/%path%?h=%branch%' elif 'git.yoctoproject.org/' in repoval: reponame = re.sub('^.*/', '', repoval) layer.vcs_web_url = 'http://git.yoctoproject.org/cgit/cgit.cgi/' + reponame
Signature · 1 line
2.1.4
PATCH 1/1 2/2] templates/rrs/recipedetail.html: Fix unneeded quotes in url call
The url template function resolve an URL associated with a model, so in Django 1.6 quotes around variables don't get the variable value.
[YOCTO #10871]
Signed-off-by Aníbal Limón <[email protected]>
--- templates/rrs/recipedetail.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
templates/rrs/recipedetail.html +2 -2
@@ -79,7 +79,7 @@ <td>{{ rud.version }}</td> {% if rud.milestone_name %} <td> - <a href="{% url 'recipes' 'rud.release_name' 'rud.milestone_name' %}"> + <a href="{% url 'recipes' rud.release_name rud.milestone_name %}"> {{ rud.release_name }} {% if rud.milestone_name != "All" %} {{ rud.milestone_name }}
@@ -97,7 +97,7 @@ <td>{{ rud.date }}</td> {% if rud.is_recipe_maintainer %} - <td><a href="{% url 'recipes' 'rud.release_name' 'rud.milestone_name' %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td> + <td><a href="{% url 'recipes' rud.release_name rud.milestone_name %}?maintainer_name={{ rud.maintainer_name|urlencode }}">{{ rud.maintainer_name }}</a></td> {% else %} <td>{{ rud.maintainer_name }}</a></td> {% endif %}
Signature · 1 line
2.1.4