cros_workon: WORKON_FILE should be owned by the user

cros_workon

 #!/bin/bash
 
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # This script moves ebuilds between 'stable' and 'live' states.
 # By default 'stable' ebuilds point at and build from source at the
 # last known good commit. Moving an ebuild to 'live' (via cros_workon start)
 # is intended to support development. The current source tip is fetched,
@@ skipping 56 matching lines @@
   BOARD_STR="host"
 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
 WORKON_FILE=${WORKON_DIR}/${FLAGS_board:-host}
 KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
 UNMASK_FILE=${UNMASK_DIR}/cros-workon
 
-# TODO(msb): remove the backward compatibility after 09/01/2010
-sudo mkdir -p "${WORKON_DIR}" "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
-  die "mkdir -p ${WORKON_DIR} ${KEYWORDS_DIR} ${UNMASK_DIR}"
+# TODO(msb): remove the backward compatibility after 10/01/2010
+if [ -d "${WORKON_DIR}" ]; then
+  sudo chown -R "${USER}" "${WORKON_DIR}"
+fi
+
+mkdir -p "${WORKON_DIR}" || die "mkdir -p ${WORKON_DIR}"
+touch "${WORKON_FILE}" || die "touch ${WORKON_FILE}"
+sudo mkdir -p "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
+  die "mkdir -p ${KEYWORDS_DIR} ${UNMASK_DIR}"
 if [ ! -L "${KEYWORDS_FILE}" ]; then
   sudo rm -f "${KEYWORDS_FILE}"
   sudo ln -s "${WORKON_FILE}" "${KEYWORDS_FILE}" || \
     die "ln -s ${WORKON_FILE} ${KEYWORDS_FILE}"
 fi
 if [ ! -L "${UNMASK_FILE}" ]; then
   [ -f "${UNMASK_FILE}" ] && sudo mv "${UNMASK_FILE}" "${WORKON_FILE}"
   sudo ln -s "${WORKON_FILE}" "${UNMASK_FILE}" || \
     die "ln -s ${WORKON_FILE} ${UNMASK_FILE}"
 fi
-sudo touch "${WORKON_FILE}" || \
-  die "touch ${WORKON_FILE}"
 
 # Canonicalize package name to category/package.
 canonicalize_name () {
   local pkgfile
   local pkgname
 
   if ! pkgfile=$(ACCEPT_KEYWORDS="**" ${EQUERYCMD} which $1); then
     warn "error looking up package $1" 1>&2
     return 1
   fi
@@ skipping 165 matching lines @@
   esac
 fi
 
 case ${WORKON_CMD} in
   start)  ebuild_to_live "${ATOM_LIST}" ;;
   stop)   ebuild_to_stable "${ATOM_LIST}" ;;
   list)   [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ;;
   iterate)ebuild_iterate "${ATOM_LIST}" ;;
   *)      die "$(basename $0): command '${WORKON_CMD}' not recognized" ;;
 esac