From 26998d4c6e289c4f8d75c253fc83d7c2e4877a34 Mon Sep 17 00:00:00 2001
From: Mandeep Singh Baines <msb@chromium.org>
Date: Mon, 24 Jan 2011 13:46:52 -0800
Subject: [PATCH] cros_workon: remove logic for handling ~ in workon file

We stopped using ~ in the workon files many months ago.

BUG=n0ne
TEST=See below.

(cros-chroot) msb@msb ~/trunk/src/scripts $ ./cros_workon --board x86-generic list
sys-kernel/chromeos-kernel
(cros-chroot) msb@msb ~/trunk/src/scripts $ ./cros_workon --board x86-generic start perf
Please run "repo sync" now.
INFO   : Started working on 'dev-util/perf' for 'x86-generic'
(cros-chroot) msb@msb ~/trunk/src/scripts $ ./cros_workon --board x86-generic list
sys-kernel/chromeos-kernel
dev-util/perf
(cros-chroot) msb@msb ~/trunk/src/scripts $ ./cros_workon --board x86-generic stop perf
INFO   : Stopped working on 'dev-util/perf' for 'x86-generic'
(cros-chroot) msb@msb ~/trunk/src/scripts $ ./cros_workon --board x86-generic list
sys-kernel/chromeos-kernel

Change-Id: I61babd89073d749111be7257b2e8491f07ca52f2

Review URL: http://codereview.chromium.org/6268012
---
 cros_workon | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cros_workon b/cros_workon
index c48b6431e5..f12bc7a9e4 100755
--- a/cros_workon
+++ b/cros_workon
@@ -135,7 +135,7 @@ canonicalize_names () {
 
 # Display ebuilds currently part of the live branch and open for development.
 show_live_ebuilds () {
-  sed -n 's/^[~=]\(.*\)-9999$/\1/p' "${WORKON_FILE}"
+  sed -n 's/^=\(.*\)-9999$/\1/p' "${WORKON_FILE}"
 }
 
 # Display ebuilds currently part of the live branch and open for development
@@ -144,7 +144,7 @@ show_all_live_ebuilds () {
   for workon_file in ${WORKON_DIR}/*; do
     if [ -s "${workon_file}" ]; then
       echo -e "${V_BOLD_GREEN}$(basename ${workon_file}):${V_VIDOFF}"
-      sed -n 's/^[~=]\(.*\)-9999$/    \1/p' "${workon_file}"
+      sed -n 's/^=\(.*\)-9999$/    \1/p' "${workon_file}"
       echo ""
     fi
   done
@@ -176,7 +176,7 @@ ebuild_to_live () {
   local atoms_success=""
 
   for atom in ${atoms}; do
-    if ! grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then
+    if ! grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then
       if sudo bash -c "echo \"=${atom}-9999\" >> \"${WORKON_FILE}\""; then
         atoms_success="${atoms_success} ${atom}"
       fi
@@ -194,8 +194,8 @@ ebuild_to_stable () {
   local atoms_success=""
 
   for atom in ${atoms}; do
-    if grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then
-      if sudo sed -e "/^[~=]${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then
+    if grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then
+      if sudo sed -e "/^=${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then
         atoms_success="${atoms_success} ${atom}"
       fi
     else