Return named output files if they're symlinks

client/run_isolated.py

 #!/usr/bin/env python
 # Copyright 2012 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.
 
 """Runs a command with optional isolated input/output.
 
 Despite name "run_isolated", can run a generic non-isolated command specified as
 args.
 
@@ skipping 314 matching lines @@
 def link_outputs_to_outdir(run_dir, out_dir, outputs):
   """Links any named outputs to out_dir so they can be uploaded.
 
   Raises an error if the file already exists in that directory.
   """
   if not outputs:
     return
   isolateserver.create_directories(out_dir, outputs)
   for o in outputs:
     try:
-      file_path.link_file(
-          os.path.join(out_dir, o),
-          os.path.join(run_dir, o),
-          file_path.HARDLINK_WITH_FALLBACK)
+      infile = os.path.join(run_dir, o)
+      outfile = os.path.join(out_dir, o)
+      if os.path.islink(infile):

[M-A Ruel, 2017/06/09 17:00:40]

use fs.islink() otherwise this throws on Windows.

[aludwin, 2017/06/09 19:37:32]

Done.

+        # TODO(aludwin): handle directories
+        file_path.readable_copy(outfile, os.path.realpath(infile))

[M-A Ruel, 2017/06/09 17:00:40]

use fs.copy2()
I don't think realpath() is necessary.

[aludwin, 2017/06/09 19:37:32]

Done.

+      else:
+        file_path.link_file(outfile, infile, file_path.HARDLINK_WITH_FALLBACK)
     except OSError as e:
       logging.info("Couldn't collect output file %s: %s", o, e)
 
 
 def delete_and_upload(storage, out_dir, leak_temp_dir):
   """Deletes the temporary run directory and uploads results back.
 
   Returns:
     tuple(outputs_ref, success, stats)
     - outputs_ref: a dict referring to the results archived back to the isolated
@@ skipping 719 matching lines @@
     return 1
 
 
 if __name__ == '__main__':
   subprocess42.inhibit_os_error_reporting()
   # Ensure that we are always running with the correct encoding.
   fix_encoding.fix_encoding()
   file_path.enable_symlink()
 
   sys.exit(main(sys.argv[1:]))