Chromium Code Reviews| Index: slave/skia_slave_scripts/prerender.py |
| diff --git a/slave/skia_slave_scripts/prerender.py b/slave/skia_slave_scripts/prerender.py |
| index bc36c07a95a25603516ccfaed7382fe4941cc71b..4f8f2ca7126a7249659fd53204ec8d2f46945cfa 100644 |
| --- a/slave/skia_slave_scripts/prerender.py |
| +++ b/slave/skia_slave_scripts/prerender.py |
| @@ -133,8 +133,13 @@ class PreRender(BuildStep): |
| if os.path.exists(skimage_host_expectations): |
| skimage_device_expectations = self._flavor_utils.DevicePathJoin( |
| self._device_dirs.SKImageExpectedDir(), skimage_expected_filename) |
| - self._flavor_utils.PushFileToDevice(skimage_host_expectations, |
| - skimage_device_expectations) |
| + # For builders without an attached device, PushFileToDevice will fail |
|
epoger
2013/08/28 18:21:54
Leon: please add a TODO referring to https://code.
scroggo
2013/08/28 18:32:40
Done.
|
| + # when attempting to copy a file to itself. In this case, there is no |
| + # need to copy. Only do the push when there is an attached device, |
| + # which corresponds to the case that the filepaths are equal. |
| + if skimage_device_expectations != skimage_host_expectations: |
| + self._flavor_utils.PushFileToDevice(skimage_host_expectations, |
| + skimage_device_expectations) |
| self._flavor_utils.CopyDirectoryContentsToDevice( |
| self._skimage_in_dir, self._device_dirs.SKImageInDir()) |