Update prebuilt to use cros_overlay_list as the definitive answer for which overlay to modify.

Update prebuilt to use cros_overlay_list as the definitive answer for which overlay to modify.

The last entry from the commands output will always be the one that we
want. By using this we also avoid having to tack on -private and hope
that people who created the overlay conformed to that naming convention.

BUG=NA
TEST=prebuilt_unittest updated and run

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=2c11e0d

[robotboy, 2011-01-19 21:32:55]

LGTM on the main change.  Not comfortable LGTMing the unit test because I have
no experience with python unit testing.

[sosa, 2011-01-19 21:51:15]

http://codereview.chromium.org/6348010/diff/1/prebuilt.py
File prebuilt.py (right):

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode337
prebuilt.py:337: if re.match('.*?_.*', target):
is this true?  It looks like variants are board (with possible -)-variant

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode338
prebuilt.py:338: (board, variant) = target.split('_')
partition might be better here ... (board, _, variant)

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode436
prebuilt.py:436: git_file = DeterminePrebuiltConfFile(build_path, board)
why?

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py
File prebuilt_unittest.py (right):

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode215
prebuilt_unittest.py:215: '%(fake_path)s/src/overlays/overlay-x86-generic\n'
You shouldn't  need to indent here

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode218
prebuilt_unittest.py:218: x86_expected_path = os.path.join(fake_path,
_BINHOST_BASE_DIR,
Could have better reuse of paths from before here i.e. variablize out fake_path
+ binhost base dir

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode234
prebuilt_unittest.py:234: targets = {'x86-generic': (x86_cmd, x86_out,
x86_expected_path),
May wanna consider using a dict of dicts to make it easier to read i.e.
targets[target]['expected_path']

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode245
prebuilt_unittest.py:245: cwd=script_path).AndReturn(
fix indentation

[scottz, 2011-01-19 22:11:06]

PTAL

http://codereview.chromium.org/6348010/diff/1/prebuilt.py
File prebuilt.py (right):

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode337
prebuilt.py:337: if re.match('.*?_.*', target):
Not in this script, in cbuild and archive_build we use the board_variant that
has been put together.
This is true for the option passed to prebuilt.py --target is meant to be board
or board_variant or am I misunderstanding what you are referring to?


On 2011/01/19 21:51:15, sosa wrote:
> is this true?  It looks like variants are board (with possible -)-variant

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode338
prebuilt.py:338: (board, variant) = target.split('_')
Can you explain a bit more what you mean here?
On 2011/01/19 21:51:15, sosa wrote:
> partition might be better here ... (board, _, variant)

http://codereview.chromium.org/6348010/diff/1/prebuilt.py#newcode436
prebuilt.py:436: git_file = DeterminePrebuiltConfFile(build_path, board)
Why did I remove os.path.join? We are now doing that inside the function now.

On 2011/01/19 21:51:15, sosa wrote:
> why?

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py
File prebuilt_unittest.py (right):

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode215
prebuilt_unittest.py:215: '%(fake_path)s/src/overlays/overlay-x86-generic\n'
I renamed the variable and forgot to re-align :) thanks

On 2011/01/19 21:51:15, sosa wrote:
> You shouldn't  need to indent here

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode218
prebuilt_unittest.py:218: x86_expected_path = os.path.join(fake_path,
_BINHOST_BASE_DIR,
On 2011/01/19 21:51:15, sosa wrote:
> Could have better reuse of paths from before here i.e. variablize out
fake_path
> + binhost base dir

I knew that was coming :) 
Done.

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode234
prebuilt_unittest.py:234: targets = {'x86-generic': (x86_cmd, x86_out,
x86_expected_path),
On 2011/01/19 21:51:15, sosa wrote:
> May wanna consider using a dict of dicts to make it easier to read i.e.
> targets[target]['expected_path']

I like it

http://codereview.chromium.org/6348010/diff/1/prebuilt_unittest.py#newcode245
prebuilt_unittest.py:245: cwd=script_path).AndReturn(
On 2011/01/19 21:51:15, sosa wrote:
> fix indentation

Done.

[sosa, 2011-01-19 22:16:52]

LGTM + nit

http://codereview.chromium.org/6348010/diff/7001/prebuilt_unittest.py
File prebuilt_unittest.py (right):

http://codereview.chromium.org/6348010/diff/7001/prebuilt_unittest.py#newcode218
prebuilt_unittest.py:218: x86_out =
('%(private_overlay_path)s//chromeos-overlay\n'
Dbl slash?

[scottz, 2011-01-19 22:21:24]

Fixed, submitting :) 

Thanks for the quick turnaround!

http://codereview.chromium.org/6348010/diff/7001/prebuilt_unittest.py
File prebuilt_unittest.py (right):

http://codereview.chromium.org/6348010/diff/7001/prebuilt_unittest.py#newcode218
prebuilt_unittest.py:218: x86_out =
('%(private_overlay_path)s//chromeos-overlay\n'
Oh snap :) thanks

On 2011/01/19 22:16:52, sosa wrote:
> Dbl slash?