commit b04e2aaec8cc0c3706428725778306fbe632c1d4
author Evan Hernandez <evanhernandez@chromium.org> Mon Apr 08 16:55:54 2019 -0600
committer Evan Hernandez <evanhernandez@chromium.org> Tue Apr 09 13:58:16 2019 +0000
tree 0b13d08f834f67492081a4306515adacd5c31403
parent 3674ce2d885b689296361236d6d537ea8e3ba73f

osutils: CopyDirContents can copy to nonempty dir.

TEST=./run_tests
BUG=chromium:949566

Change-Id: Iea21a037419b861ea89d6266a76a2ac9bd9648f1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1559165
Reviewed-by: Evan Hernandez <evanhernandez@chromium.org>
Reviewed-by: Sean Abraham <seanabraham@chromium.org>
Commit-Queue: Evan Hernandez <evanhernandez@chromium.org>
Tested-by: Evan Hernandez <evanhernandez@chromium.org>

api/controller/artifacts.py

diff --git a/api/controller/artifacts.py b/api/controller/artifacts.py
index 8f0d829..476f593 100644
--- a/api/controller/artifacts.py
+++ b/api/controller/artifacts.py
@@ -56,7 +56,7 @@
       if os.path.isfile(path):
         rel_path = os.path.relpath(path, temp)
         output_proto.artifacts.add().path = os.path.join(output_dir, rel_path)
-    osutils.CopyDirContents(temp, output_dir)
+    osutils.CopyDirContents(temp, output_dir, allow_nonempty=True)
 
 
 def BundleAutotestFiles(input_proto, output_proto):