cros_workon: check selected packages if they are cros-workon, related 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 48 matching lines @@
 KEYWORDS_FILE=${KEYWORDS_DIR}/cros-workon
 UNMASK_FILE=${UNMASK_DIR}/cros-workon
 
 sudo mkdir -p "${KEYWORDS_DIR}" "${UNMASK_DIR}" || \
   die "mkdir -p ${KEYWORDS_DIR} ${UNMASK_DIR}"
 sudo touch "${KEYWORDS_FILE}" "${UNMASK_FILE}" || \
   die "touch ${KEYWORDS_FILE} ${UNMASK_FILE}"
 
 # Canonicalize package name to category/package.
 canonicalize_name () {
-  ${EQUERY} which $1 | \
-    awk -F '/' '{ print $(NF-2) "/" $(NF-1) }'
+  local pkgfile
+  local pkgname
+
+  if ! pkgfile=$(${EQUERY} which $1); then
+    warn "error looking up package $1" 1>&2
+    return 1
+  fi
+
+  pkgname=$(\
+    echo "${pkgfile}" |awk -F '/' '{ print $(NF-2) "/" $(NF-1) }')
+
+  if ! grep -q "cros-workon" ${pkgfile}; then
+    warn "${pkgname} is not a cros-workon package" 1>&2
+    return 1
+  fi
+  echo "${pkgname}"
+  return 0
 }
 
 # Canonicalize a list of names.
 canonicalize_names () {
   local atoms=$1
   local names=""
 
   for atom in ${atoms}; do
     local name=$(canonicalize_name "${atom}")
     [ -n "${name}" ] || return 1
     names+=" ${name}"
   done
-  echo ${names}
+
+  echo "${names}"
 }
 
 # Display ebuilds currently part of the live branch and open for development.
 show_live_ebuilds () {
   cat "${KEYWORDS_FILE}"
 }
 
 ATOM_LIST=$@
-ATOM_LIST=$(canonicalize_names "${ATOM_LIST}") || die "Invalid package name"
-[ -n "${ATOM_LIST}" ] || ATOM_LIST=$(show_live_ebuilds)
+if [ -z "${ATOM_LIST}" ]; then
+  ATOM_LIST=$(show_live_ebuilds)
+else
+  if ! ATOM_LIST=$(canonicalize_names "${ATOM_LIST}"); then
+    die "Error parsing package list"
+  fi
+fi
 
 # 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}\""
@@ skipping 34 matching lines @@
   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