cros_workon: refactor local manifest creation, kill duplicate entries (repo doesn't like them)

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 114 matching lines @@
   exit 1
 }
 
 
 # This is called only for "cros-workon start". We dont handle the "stop" case since the local changes are ignored anyway since the 9999.ebuild is masked and we dont want to deal with what to do with the user's local changes.
 regen_manifest_and_sync() {
   find_repo_dir
   echo Using $REPODIR
   echo "Trying to generate local manifests for.."
   rm -f $REPODIR/local_manifest.xml
-  echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> $REPODIR/local_manifest.xml
-  echo "<manifest>" >> $REPODIR/local_manifest.xml
 
-  cat ${KEYWORDS_FILE} |
+  MANIFEST_ENTRIES=$(cat ${KEYWORDS_FILE} |
   {
     while read line
     do
       pkgname=`basename ${line}`
-      echo "Now working on ... ${pkgname}"
+      echo "Now working on ... ${pkgname}" 1>&2
       eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info)
-      echo "Looking for ${CROS_WORKON_PROJECT}.git"
+      echo "Looking for ${CROS_WORKON_PROJECT}.git" 1>&2
       REPO_ELEMENT=$(sed -n '/START_MINILAYOUT/,/STOP_MINILAYOUT/p' $REPODIR/manifest.xml | grep "name=\"${CROS_WORKON_PROJECT}\"" | sed -e 's/^[ \t]*//')
-      echo $REPO_ELEMENT
+      echo "$REPO_ELEMENT"
       if [ -z "${REPO_ELEMENT}" ] ; then
-        echo "Unable to find ${pkgname} in manifest. Aborting."
+        echo "Unable to find ${pkgname} in manifest. Aborting." 1>&2
         exit 1
       fi
-      echo ${REPO_ELEMENT} >> $REPODIR/local_manifest.xml
     done
-  }
-  echo "</manifest>" >> $REPODIR/local_manifest.xml
+  })
+
+  if [ -n "${MANIFEST_ENTRIES}" ]; then
+    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> $REPODIR/local_manifest.xml
+    echo "<manifest>" >> $REPODIR/local_manifest.xml
+    echo "${MANIFEST_ENTRIES}"|sort|uniq >> ${REPODIR}/local_manifest.xml
+    echo "</manifest>" >> $REPODIR/local_manifest.xml
+  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}\""
@@ skipping 57 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 "invalid cros_workon command" ;;
 esac