From 99b3f551d82cd22e521a1e5e577c17f5b596440a Mon Sep 17 00:00:00 2001 From: Olof Johansson Date: Fri, 29 Oct 2010 09:50:23 -0500 Subject: [PATCH] prebuilt.py: fix variant detection regex Without this, I get: Traceback (most recent call last): File "./prebuilt.py", line 495, in 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 --- prebuilt.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/prebuilt.py b/prebuilt.py index 904ee74a84..df7f6e36dc 100755 --- a/prebuilt.py +++ b/prebuilt.py @@ -367,7 +367,7 @@ def DetermineMakeConfFile(target): # TODO(Scottz): as new host targets come online expand this to # work more like boards. make_path = _PREBUILT_MAKE_CONF[target] - elif re.match('.*?-.*?_.*', target): + elif re.match('.*?_.*', target): # We are a board variant overlay_str = 'overlay-variant-%s' % target.replace('_', '-') make_path = os.path.join(_BINHOST_BASE_DIR, overlay_str, 'make.conf')