diff options
author | Han Shen <shenhan@google.com> | 2015-03-24 09:54:32 -0700 |
---|---|---|
committer | ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> | 2015-03-25 01:33:51 +0000 |
commit | f9bb4a966e59736fe6c9eea198faf3613b5110f8 (patch) | |
tree | 745712424be9d4db36feaf7d2cb4f3162a407345 /image_chromeos.py | |
parent | 5d7e21d72b17274a81a64a8040e1a30697e1223b (diff) | |
download | toolchain-utils-f9bb4a966e59736fe6c9eea198faf3613b5110f8.tar.gz |
Remove invocation to 'cros_image_to_taget.py', which was deprecated on Feb 4.
Nightly failed because image_chromeos.py used
'cros_image_to_target.py' (this part still needs to examination ) to
image the machines.
Change-Id: I918e4a99a301ab6cc120fccd0b01c454597b8336
Reviewed-on: https://chrome-internal-review.googlesource.com/210135
Reviewed-by: Caroline Tice <cmtice@google.com>
Commit-Queue: Han Shen <shenhan@google.com>
Tested-by: Han Shen <shenhan@google.com>
Diffstat (limited to 'image_chromeos.py')
-rwxr-xr-x | image_chromeos.py | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/image_chromeos.py b/image_chromeos.py index 460215ae..d2f3ee00 100755 --- a/image_chromeos.py +++ b/image_chromeos.py @@ -199,29 +199,15 @@ def DoImage(argv): options.remote, chroot_image] else: - cros_flash_args = ["--board=%s" % board, "--clobber-stateful", options.remote, image] command = ("cros flash %s" % " ".join(cros_flash_args)) - elif local_image: - # Use 'cros_image_to_target.py' - cros_image_to_target_args = ["--remote=%s" % options.remote, - "--board=%s" % board, - "--from=%s" % os.path.dirname(chroot_image), - "--image-name=%s" % - os.path.basename(located_image)] - - command = ("./bin/cros_image_to_target.py %s" % - " ".join(cros_image_to_target_args)) - if options.image_args: - command += " %s" % options.image_args else: - raise Exception("Unable to find 'cros flash' in chroot; cannot use " - "non-local image (%s) with cros_image_to_target.py" % - image) + raise Exception(("Unable to find 'cros flash' in chroot;" + "chromeos tree is too old.")) # Workaround for crosbug.com/35684. os.chmod(misc.GetChromeOSKeyFile(options.chromeos_root), 0600) |