commit 5f3cf72a87a91031cc6504a5c7cd2924e9feb70e
author Aviv Keshet <akeshet@chromium.org> Thu May 09 17:35:25 2013 -0700
committer ChromeBot <chrome-bot@google.com> Thu May 09 19:50:56 2013 -0700
tree b42c3c1b2ac3813787c5686d4ae98ecc91340ca7
parent b1794fc937b125c4a3867ca5a7ca08d24f64bdeb

autotest_quickmerge: fix breakage in building autotest-tests

Instead of making quickmerge-created files be owned by autotest-tests
(an arbitrary choice), make them owned by autotest. This ensures that
they are properly unmerged before tests are built.

BUG=chromium:239631
TEST=While cros working on autotest-tests, do a `autotest_quickmerge
--board={board}`, then do a `build_packages`. Build no longer fails.
Same applies when working on `autotest`, or `autotest-chrome`.

Change-Id: I3c1df56c5b504f01594de14aa4c5bdaa7d8b1e8d
Reviewed-on: https://gerrit.chromium.org/gerrit/50749
Tested-by: Aviv Keshet <akeshet@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Commit-Queue: Aviv Keshet <akeshet@chromium.org>

scripts/autotest_quickmerge.py

diff --git a/scripts/autotest_quickmerge.py b/scripts/autotest_quickmerge.py
index d39d899..b1d01b6 100644
--- a/scripts/autotest_quickmerge.py
+++ b/scripts/autotest_quickmerge.py
@@ -30,7 +30,7 @@
 
 INCLUDE_PATTERNS_FILENAME = 'autotest-quickmerge-includepatterns'
 AUTOTEST_PROJECT_NAME = 'chromiumos/third_party/autotest'
-AUTOTEST_TESTS_EBUILD = 'chromeos-base/autotest-tests'
+AUTOTEST_EBUILD = 'chromeos-base/autotest'
 DOWNGRADE_EBUILDS = ['chromeos-base/autotest',
                      'chromeos-base/autotest-tests',
                      'chromeos-base/autotest-chrome',
@@ -333,7 +333,7 @@
                                                 sysroot_autotest_path)
 
   if not args.pretend:
-    UpdatePackageContents(change_report, AUTOTEST_TESTS_EBUILD,
+    UpdatePackageContents(change_report, AUTOTEST_EBUILD,
                           sysroot_path)
     for ebuild in DOWNGRADE_EBUILDS:
       if not DowngradePackageVersion(sysroot_path, ebuild):