From e266b3b850764e8d119a2c6532fc047633c44920 Mon Sep 17 00:00:00 2001 From: Chris Wolfe Date: Tue, 13 Mar 2012 10:07:48 -0400 Subject: [PATCH] cros_workon: fix for renamed chrome_set_ver The chromite chrome_set_ver.py script lost its '.py' extension as part of some recent refactoring. This updates the cros_workon script with the new name. BUG=None TEST=cros_workon start chromeos-chrome no longer reports missing file. Change-Id: Iae2e88739c4483243581d53daf1ade630e44ab3a Reviewed-on: https://gerrit.chromium.org/gerrit/17963 Tested-by: Chris Wolfe Reviewed-by: Brian Harring Commit-Ready: Chris Wolfe --- cros_workon | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/cros_workon b/cros_workon index 225731c53f..281ebe62bd 100755 --- a/cros_workon +++ b/cros_workon @@ -73,12 +73,10 @@ fi WORKON_DIR=${CHROOT_TRUNK_DIR}/.config/cros_workon KEYWORDS_DIR=${BOARD_DIR}/etc/portage/package.keywords UNMASK_DIR=${BOARD_DIR}/etc/portage/package.unmask -CHROMITE_DIR=${CHROOT_TRUNK_DIR}/chromite WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host} KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon UNMASK_FILE=${UNMASK_DIR}/cros-workon CHROME_ATOM=chromeos-base/chromeos-chrome -CHROME_SET_VER=${CHROMITE_DIR}/bin/chrome_set_ver.py mkdir -p "${WORKON_DIR}" || die "mkdir -p ${WORKON_DIR}" touch "${WORKON_FILE}" || die "touch ${WORKON_FILE}" @@ -278,7 +276,7 @@ chrome_to_live () { fi info "Setting Chrome dependencies to the correct revision." - ${CHROME_SET_VER} + chrome_set_ver if [ -n "${CHROME_ORIGIN}" ] && [ "${CHROME_ORIGIN}" != GERRIT_SOURCE ]; then warn "CHROME_ORIGIN is already set to ${CHROME_ORIGIN}" warn "To use the new GERRIT_SOURCE workflow, please unset it."