cros_workon: modify regen_manifest_and_sync to use loman

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 135 matching lines @@
     fi
     curdir=`dirname "$curdir"`
   done
   echo "Unable to find .repo directory. Did you checkout with repo?"
   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
-  local_manifest="${REPODIR}/local_manifest.xml"
+  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})/}
 
-  # ensure we don't clobber existing manifest entries
-  if [ -f "${local_manifest}" ]; then
-    grep -q -i "<remote" "${local_manifest}"
-    if [ $? -ne 1 ]; then
-      die "Your local manifest will be clobbered running cros_workon. You can not have any <remote> tags at all."
-    fi
-    sed -ne '/^[[:space:]]\+[^[:space:]]/q1' "${local_manifest}"
-    if [ $? -ne 0 ]; then
-      die "Your local manifest will be clobbered running cros_workon. You can not have any tags that span multiple lines or are indented."
-    fi
-    egrep -q "^[^<]" "${local_manifest}"
-    if [ $? -ne 1 ]; then
-      die "Your local manifest will be clobbered running cros_workon. You can not have any tags that span multiple lines"
-    fi
-    grep -v "<project" "${local_manifest}" | grep -q -i "<project"
-    if [ $? -eq 0 ]; then
-      die "Your local manifest has mixed case tags for project.  You can not have mixed case tags"
-    fi
-  fi
-  # preserve old manifest entries
-  [ -f "${local_manifest}" ] && \
-    MANIFEST_ENTRIES_OLD=$(cat "${local_manifest}" | grep "^<project")
-
-  rm -f "${local_manifest}"
-
-  # get new manifest entries
-  MANIFEST_ENTRIES=$(show_live_ebuilds |
-  {
-    while read line
-    do
-      pkgname=`basename ${line}`
-      eval $(${EBUILDCMD} $(${EQUERYCMD} which ${pkgname}) info)
-      REPO_ELEMENT=$(sed -n '/START_MINILAYOUT/,/STOP_MINILAYOUT/p' $REPODIR/manifest.xml | grep "name=\"${CROS_WORKON_PROJECT}\"" | sed -e 's/^[ \t]*//')
-      echo "$REPO_ELEMENT"
-    done
-  })
-
-  if [ -n "${MANIFEST_ENTRIES}" ] || [ -n "${MANIFEST_ENTRIES_OLD}" ]; then
-    info "Creating local manifest for workon packages.."
-    echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" >> "${local_manifest}"
-    echo "<manifest>" >> "${local_manifest}"
-    echo -e "${MANIFEST_ENTRIES}\n${MANIFEST_ENTRIES_OLD}" \
-      | sort | uniq >> "${local_manifest}"
-    echo "</manifest>" >> "${local_manifest}"
-    echo "Please run \"repo sync\" now."
-  fi
+    loman add --workon "${CROS_WORKON_PROJECT}" "${project_path}"
+  done
+  echo "Please run \"repo sync\" now."
 }
 
 # 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
   local atoms_success=""
 
   for atom in ${atoms}; do
     if ! grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then
@@ skipping 58 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 ${BOARD_KEYWORD} ;;
   iterate)ebuild_iterate "${ATOM_LIST}" ;;
   *)      die "$(basename $0): command '${WORKON_CMD}' not recognized" ;;
 esac