Index: appengine/swarming/templates/user_task.html |
diff --git a/appengine/swarming/templates/user_task.html b/appengine/swarming/templates/user_task.html |
index 8f7ecc5aa6b428c6166eb058ddac6932abb96ff7..670cfdcec99e623cbf125cb5088ef2ea14aa9738 100644 |
--- a/appengine/swarming/templates/user_task.html |
+++ b/appengine/swarming/templates/user_task.html |
@@ -73,6 +73,14 @@ |
.package-list { |
margin-left: 1em; |
} |
+ |
+ .package-pin-name { |
+ font-weight: bold; |
+ } |
+ |
+ .package-pin-version { |
+ color: blue; |
+ } |
</style> |
{% endblock %} |
@@ -235,10 +243,25 @@ |
<tr title="CIPD pacakges"> |
<td>CIPD packages</td> |
<td> |
- {% for path, packages in request.properties.cipd_input.packages_grouped_by_path() %} |
+ {% for path, pininfos in request.properties.cipd_input.packages_grouped_by_path(result.cipd_pins) %} |
<div>{{ path or '.'}}/</div> |
<div class="package-list"> |
- {{packages|join('<br>'|safe)}} |
+ {% for pi in pininfos %} |
+ {% if pi.pin %} |
+ {{pi.pkg}} |
+ (pinned |
+ {% if pi.pin.package_name %} |
+ <span class="package-pin-name">{{pi.pin.package_name}}</span> |
+ {% endif %} |
+ {% if pi.pin.version %} |
+ @<span class="package-pin-version">{{pi.pin.version}}</span> |
+ {% endif%} |
+ ) |
+ {% else %} |
+ {{pi.pkg}} |
+ {% endif %} |
+ {% if not loop.last %}<br>{% endif %} |
+ {% endfor %} |
</div> |
{% endfor %} |
</td> |