diff options
author | Ahmad Sharif <asharif@chromium.org> | 2012-05-07 12:02:16 -0700 |
---|---|---|
committer | Ahmad Sharif <asharif@chromium.org> | 2012-05-07 12:02:16 -0700 |
commit | fd356fb31c4340851fecc750230d05c9518b125c (patch) | |
tree | 694f1a93f568d5e46655c30bb76cb71d7400f11b /image_chromeos.py | |
parent | 92ab7af223c82fe8897bacea8b32028828eab018 (diff) | |
download | toolchain-utils-fd356fb31c4340851fecc750230d05c9518b125c.tar.gz |
Synced repos to: 60208
Diffstat (limited to 'image_chromeos.py')
-rwxr-xr-x | image_chromeos.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/image_chromeos.py b/image_chromeos.py index 17812d4d..f1497fb9 100755 --- a/image_chromeos.py +++ b/image_chromeos.py @@ -18,6 +18,7 @@ import sys import tempfile from utils import command_executer from utils import logger +from utils import misc from utils.file_utils import FileUtils checksum_file = "/usr/local/osimage_checksum_file" @@ -68,10 +69,14 @@ def Main(argv): board = options.board if options.image is None: - image = (options.chromeos_root + - "/src/build/images/" + board + - "/latest/" + - "/chromiumos_image.bin") + images_dir = misc.GetImageDir(options.chromeos_root, board) + image = os.path.join(images_dir, + "latest", + "chromiumos_test_image.bin") + if not os.path.exists(image): + image = os.path.join(images_dir, + "latest", + "chromiumos_image.bin") else: image = options.image image = os.path.expanduser(image) |