cros_workon: corner case fixes

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 83 matching lines @@
 
 # Move a stable ebuild to the live development catgeory.  The ebuild
 # src_unpack step fetches the package source for local development.
 ebuild_to_live () {
   local atoms=$1
 
   for atom in ${atoms}; do
     if ! grep -qx "${atom}" "${KEYWORDS_FILE}" ; then
       sudo bash -c "echo \"${atom}\" >> \"${KEYWORDS_FILE}\""
       sudo bash -c "echo \"~${atom}-9999\" >> \"${UNMASK_FILE}\""
+    else
+      warn "Already working on ${atom}"
     fi
   done
 }
 
 # Move a live development ebuild back to stable.
 ebuild_to_stable () {
   local atoms=$1
 
   for atom in ${atoms}; do
-    # remove the keyword
-    sudo bash -c "grep -v '^${atom}\$' \"${KEYWORDS_FILE}\" > \
-        \"${KEYWORDS_FILE}+\""
-    sudo mv "${KEYWORDS_FILE}+" "${KEYWORDS_FILE}"
-    # remove the unmask
-    sudo bash -c "grep -v '^~${atom}-9999\$' \"${UNMASK_FILE}\" > \
-        \"${UNMASK_FILE}+\""
-    sudo mv "${UNMASK_FILE}+" "${UNMASK_FILE}"
-
+    if grep -qx "${atom}" "${KEYWORDS_FILE}" ; then
+      # remove the keyword
+      sudo bash -c "grep -v '^${atom}\$' \"${KEYWORDS_FILE}\" > \
+          \"${KEYWORDS_FILE}+\""
+      sudo mv "${KEYWORDS_FILE}+" "${KEYWORDS_FILE}"
+      # remove the unmask
+      sudo bash -c "grep -v '^~${atom}-9999\$' \"${UNMASK_FILE}\" > \
+          \"${UNMASK_FILE}+\""
+      sudo mv "${UNMASK_FILE}+" "${UNMASK_FILE}"
+    else
+      warn "Not working on ${atom}"
+    fi
   done
 }
 
 # Run a command on all or a set of repos.
 ebuild_forall() {
   local atoms=$1
 
   for atom in ${atoms}; do
     info "Running \"${FLAGS_command}\" on ${atom}"
     eval $(ebuild-${FLAGS_board} $(${EQUERY} which ${atom}) info)
     (cd "${CROS_WORKON_SRCDIR}" && bash -c "${FLAGS_command}")
   done
 }
 
 case ${WORKON_CMD} in
   start)  ebuild_to_live "${ATOM_LIST}" ;;
   stop)   ebuild_to_stable "${ATOM_LIST}" ;;
   list)   show_live_ebuilds ;;
   forall) ebuild_forall "${ATOM_LIST}" ;;
   *)      die "invalid cros_workon command" ;;
 esac