From 30b64cab3fdcdfd23aca44d1162608cb976f2672 Mon Sep 17 00:00:00 2001 From: Mandeep Singh Baines Date: Thu, 16 Sep 2010 14:28:31 -0700 Subject: [PATCH] cros_workon: fix bug where cros_workon start doesn't work for first start If the checkout dir doesn't already exist cros_workon start will print the wrong dir. Fixed by using readlink -m instead. BUG=none TEST=Verified that first start is incorrect without this patch but is fixed with this patch. Change-Id: I5db29a8c1737dea1dbe4866e18576f67b9355f84 Review URL: http://codereview.chromium.org/3434008 --- cros_workon | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cros_workon b/cros_workon index 22b375201d..d71879f930 100755 --- a/cros_workon +++ b/cros_workon @@ -155,9 +155,9 @@ find_repo_dir () { regen_manifest_and_sync() { for pkgname in $(show_live_ebuilds); do eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info) - local srcdir=$(readlink -f ${CROS_WORKON_SRCDIR}) - local trunkdir=$(readlink -f ${CHROOT_TRUNK_DIR}) - local project_path=${srcdir#$(readlink -f ${CHROOT_TRUNK_DIR})/} + local srcdir=$(readlink -m ${CROS_WORKON_SRCDIR}) + local trunkdir=$(readlink -m ${CHROOT_TRUNK_DIR}) + local project_path=${srcdir#${trunkdir}/} loman add --workon "${CROS_WORKON_PROJECT}" "${project_path}" done