From 710e7e9697132cc10497fdaa4987979ba6d05bd5 Mon Sep 17 00:00:00 2001 From: Brian Harring Date: Tue, 4 Sep 2012 21:23:06 -0700 Subject: [PATCH] Fix breakage induced by CL:342067. Specifically, argument handling was tightened- loman now enforces argument count (rather than just ignoring it). This however broke cros_workon. Joy. BUG=chromium-os:32247,chromium-os:31867,chromium-os:9914 TEST=manual; cros_workon start --board chromeos-base/chrome-login Change-Id: Ic58ec457b7f43e14fa6347e8752653d5a466114f Reviewed-on: https://gerrit.chromium.org/gerrit/32207 Reviewed-by: Brian Harring Tested-by: Brian Harring --- cros_workon | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cros_workon b/cros_workon index c575ca6189..72637d052b 100755 --- a/cros_workon +++ b/cros_workon @@ -275,12 +275,11 @@ regen_manifest_and_sync() { need_repo_sync='yes' for S in "${CROS_WORKON_SRCDIR[@]}"; do local srcdir=$(readlink -m "${S}") - local project_path=${srcdir#${trunkdir}/} - local name_path="${CROS_WORKON_PROJECT[i]} ${project_path}" if [ -z "${FLAGS_remote}" ]; then - loman add --workon ${name_path} + loman add --workon "${CROS_WORKON_PROJECT[i]}" else - loman add ${name_path} --remote="${FLAGS_remote}" + loman add --remote "${FLAGS_remote}" "${CROS_WORKON_PROJECT[i]}" \ + "${srcdir#${trunkdir}/}" fi : $(( ++i )) done