[Android] Fix checksum handling when md5sum generates unexpected output.

build/android/pylib/device/device_utils.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 845 matching lines @@
 
     host_hash_tuples = md5sum.CalculateHostMd5Sums([real_host_path])
     device_paths_to_md5 = (
         real_device_path if os.path.isfile(real_host_path)
         else ('%s/%s' % (real_device_path, os.path.relpath(p, real_host_path))
               for _, p in host_hash_tuples))
     device_hash_tuples = md5sum.CalculateDeviceMd5Sums(
         device_paths_to_md5, self)
 
     if os.path.isfile(host_path):
-      if (not device_hash_tuples
-          or device_hash_tuples[0].hash != host_hash_tuples[0].hash):
+      host_hash = None
+      for h, p in host_hash_tuples or ():
+        if p == real_host_path:
+          host_hash = h
+
+      device_hash = None
+      for h, p in device_hash_tuples or ():
+        if p == real_device_path:
+          device_hash = h

[perezju, 2015/04/23 09:54:59]

really sounds like md5sum functions should return a dictionary of {path: hash,
...}?

[jbudorick, 2015/04/23 16:20:14]

I suppose so. Done.

+
+      if host_hash != device_hash:
         return [(host_path, device_path)]
       else:
         return []
     else:
       device_tuple_dict = dict((d.path, d.hash) for d in device_hash_tuples)
       to_push = []
       for host_hash, host_abs_path in (
           (h.hash, h.path) for h in host_hash_tuples):
         device_abs_path = '%s/%s' % (
             real_device_path, os.path.relpath(host_abs_path, real_host_path))
@@ skipping 697 matching lines @@
     """Returns client cache."""
     if client_name not in self._client_caches:
       self._client_caches[client_name] = {}
     return self._client_caches[client_name]
 
   def _ClearCache(self):
     """Clears all caches."""
     for client in self._client_caches:
       self._client_caches[client].clear()
     self._cache.clear()