scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json - Issue 2402583003: Revert "Fix file.copy recipe_module to not fail if files are already equal."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json

Issue 2402583003: Revert "Fix file.copy recipe_module to not fail if files are already equal." (Closed)

Patch Set: Created 4 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « scripts/slave/recipes/cronet.expected/android_cronet_lollipop_builder.json ('k') | scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_perf.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json

diff --git a/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json

index a40a8ab0a3285c5b9c64fb2e453339b75674de5c..f58c21403faaebc9d4d845991279e2f971bcc79c 100644

--- a/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json

+++ b/scripts/slave/recipes/cronet.expected/android_cronet_marshmallow_64bit_builder.json

@@ -843,7 +843,7 @@

"cmd": [

"python",

"-u",

- "\nimport shutil\nimport sys\n# Apparently, shutil.copy fails if files are binary-equal on *nix OSes.\n# See http://crbug.com/636168#c8.\nif hasattr(shutil, '_samefile'):\n if shutil._samefile(sys.argv[1], sys.argv[2]):\n sys.exit(0)\nshutil.copy(sys.argv[1], sys.argv[2])\n",

+ "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

"[SLAVE_BUILD]/src/chrome/VERSION",

"/path/to/tmp/"