prebuilt.py: fix variant detection regex

Without this, I get:

Traceback (most recent call last):
  File "./prebuilt.py", line 495, in <module>
    main()
  File "./prebuilt.py", line 491, in main
    git_sync=options.git_sync)
  File "./prebuilt.py", line 408, in UploadPrebuilt
    git_file = os.path.join(build_path, DetermineMakeConfFile(board))
  File "./prebuilt.py", line 378, in DetermineMakeConfFile
    raise UnknownBoardFormat('Unknown format: %s' % target)
__main__.UnknownBoardFormat: Unknown format: tegra2_seaboard

Change-Id: I1d595b7e1c596139acca344f7a145143686dace1

BUG=chromium-os:8388
TEST=./prebuilt.py  -p ~/chromiumos -b tegra2_seaboard  -u user@workstation:/tmp

Review URL: http://codereview.chromium.org/4184007
This commit is contained in:
Olof Johansson 2010-10-29 09:50:23 -05:00
parent 51914da137
commit 99b3f551d8

View File

@ -367,7 +367,7 @@ def DetermineMakeConfFile(target):
# TODO(Scottz): as new host targets come online expand this to # TODO(Scottz): as new host targets come online expand this to
# work more like boards. # work more like boards.
make_path = _PREBUILT_MAKE_CONF[target] make_path = _PREBUILT_MAKE_CONF[target]
elif re.match('.*?-.*?_.*', target): elif re.match('.*?_.*', target):
# We are a board variant # We are a board variant
overlay_str = 'overlay-variant-%s' % target.replace('_', '-') overlay_str = 'overlay-variant-%s' % target.replace('_', '-')
make_path = os.path.join(_BINHOST_BASE_DIR, overlay_str, 'make.conf') make_path = os.path.join(_BINHOST_BASE_DIR, overlay_str, 'make.conf')