Fix Actual CIPD versions

appengine/swarming/ui/res/imp/taskpage/task-page.html

 <!--
   Copyright 2016 The LUCI Authors. All rights reserved.
   Use of this source code is governed under the Apache License, Version 2.0
   that can be found in the LICENSE file.
 
   This in an HTML Import-able file that contains the definition
   of the following elements:
 
     <task-page>
 
@@ skipping 845 matching lines @@
         // Add one because rowSpan counts from 1.
         return rowSpan + 1;
       },
 
       _cipdPackages: function(request, result) {
         if (!request || !request.properties || !request.properties.cipd_input) {
           return [];
         }
         var packages = request.properties.cipd_input.packages || [];
         var actual = (result && result.cipd_pins && result.cipd_pins.packages) || [];
-        packages.forEach(function(p) {
+        packages.forEach(function(p, i) {
           p.requested = p.package_name + ":" + p.version;
-          actual.forEach(function(c) {
-            if (c.path === p.path) {
-              p.actual = c.package_name + ":" + c.version;
-            }
-          });
+          // This makes the key assumption that the actual cipd array is in the same order
+          // as the requested one. Otherwise, there's no easy way to match them up, because
+          // of the wildcards (e.g. requested is foo/${platform} and actual is foo/linux-amd64)
+          if (actual[i]) {
+            p.actual = actual[i].package_name + ":" + actual[i].version;
+          }
         });
         return packages;
       },
 
       _classRight: function(wide_logs) {
         if (wide_logs) {
           return "full-width";
         }
         return "";
       },
@@ skipping 293 matching lines @@
 
         this._getJsonAsync("_other_running", "/api/swarming/v1/tasks/count", "_busyRunningCount", this._auth_headers, taskCountParams);
         // change running to pending
         taskCountParams.state = ["PENDING"];
         this._getJsonAsync("_other_pending", "/api/swarming/v1/tasks/count", "_busyPendingCount", this._auth_headers, taskCountParams);
       }
     });
   })();
   </script>
 </dom-module>