commit 710e7e9697132cc10497fdaa4987979ba6d05bd5
author Brian Harring <ferringb@chromium.org> Tue Sep 04 21:23:06 2012 -0700
committer Brian Harring <ferringb@chromium.org> Tue Sep 04 21:43:53 2012 -0700
tree 5955ac1af47220f1749d8b7b6aa46fc215a304d4
parent 299493f3408c6a43d8e838ba1a0f4b66a4e06bff

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 <blah> chromeos-base/chrome-login

Change-Id: Ic58ec457b7f43e14fa6347e8752653d5a466114f
Reviewed-on: https://gerrit.chromium.org/gerrit/32207
Reviewed-by: Brian Harring <ferringb@chromium.org>
Tested-by: Brian Harring <ferringb@chromium.org>

cros_workon

diff --git a/cros_workon b/cros_workon
index c575ca6..72637d0 100755
--- a/cros_workon
+++ b/cros_workon
@@ -275,12 +275,11 @@
     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