mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-24 23:21:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

cros_workon: remove logic for handling ~ in workon file

Browse Source 
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
This commit is contained in:
Mandeep Singh Baines 2011-01-24 13:46:52 -08:00
parent 72444a2bf6
commit 26998d4c6e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cros_workon
View File

@ -135,7 +135,7 @@ canonicalize_names () {
# Display ebuilds currently part of the live branch and open for development. # Display ebuilds currently part of the live branch and open for development.
show_live_ebuilds () { 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 # 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 for workon_file in ${WORKON_DIR}/*; do
if [ -s "${workon_file}" ]; then if [ -s "${workon_file}" ]; then
echo -e "${V_BOLD_GREEN}$(basename ${workon_file}):${V_VIDOFF}" 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 "" echo ""
fi fi
done done
@ -176,7 +176,7 @@ ebuild_to_live () {
local atoms_success="" local atoms_success=""
for atom in ${atoms}; do 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 if sudo bash -c "echo \"=${atom}-9999\" >> \"${WORKON_FILE}\""; then
atoms_success="${atoms_success} ${atom}" atoms_success="${atoms_success} ${atom}"
fi fi
@ -194,8 +194,8 @@ ebuild_to_stable () {
local atoms_success="" local atoms_success=""
for atom in ${atoms}; do for atom in ${atoms}; do
if grep -qx "[~=]${atom}-9999" "${WORKON_FILE}" ; then if grep -qx "=${atom}-9999" "${WORKON_FILE}" ; then
if sudo sed -e "/^[~=]${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then if sudo sed -e "/^=${atom/\//\\/}-9999\$/d" -i "${WORKON_FILE}"; then
atoms_success="${atoms_success} ${atom}" atoms_success="${atoms_success} ${atom}"
fi fi
else else