mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-11 06:56:58 +02:00
Revert "cros-workon: change forall into iterate"
This breaks cros-workon list, which is used by build_packages.
This reverts commit dc3359ba7c
.
Review URL: http://codereview.chromium.org/3008005
This commit is contained in:
parent
677d9c9b6c
commit
21d93ccac3
30
cros_workon
30
cros_workon
@ -27,12 +27,12 @@ DEFINE_string command "git status" \
|
|||||||
DEFINE_boolean all "${FLAGS_FALSE}" \
|
DEFINE_boolean all "${FLAGS_FALSE}" \
|
||||||
"Apply to all possible packages for the given command"
|
"Apply to all possible packages for the given command"
|
||||||
|
|
||||||
FLAGS_HELP="usage: $0 <command> [flags] [<list of packages>|--all]
|
FLAGS_HELP="usage: $0 <command> [flags]
|
||||||
commands:
|
commands:
|
||||||
start: Moves an ebuild to live (intended to support development)
|
start: Moves an ebuild to live (intended to support development)
|
||||||
stop: Moves an ebuild to stable (use last known good)
|
stop: Moves an ebuild to stable (use last known good)
|
||||||
list: List of live ebuilds (workon ebuilds if --all)
|
list: List of live ebuilds (workon ebuilds if --all)
|
||||||
iterate: For each ebuild, cd to the source dir and run a commond"
|
forall: For each ebuild, cd to the source dir and run a commond"
|
||||||
FLAGS "$@" || exit 1
|
FLAGS "$@" || exit 1
|
||||||
eval set -- "${FLAGS_ARGV}"
|
eval set -- "${FLAGS_ARGV}"
|
||||||
|
|
||||||
@ -144,7 +144,7 @@ ebuild_to_stable () {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Run a command on all or a set of repos.
|
# Run a command on all or a set of repos.
|
||||||
ebuild_iterate() {
|
ebuild_forall() {
|
||||||
local atoms=$1
|
local atoms=$1
|
||||||
|
|
||||||
for atom in ${atoms}; do
|
for atom in ${atoms}; do
|
||||||
@ -172,23 +172,33 @@ show_workon_ebuilds() {
|
|||||||
if [ ${FLAGS_all} = "${FLAGS_TRUE}" ]; then
|
if [ ${FLAGS_all} = "${FLAGS_TRUE}" ]; then
|
||||||
case ${WORKON_CMD} in
|
case ${WORKON_CMD} in
|
||||||
start) ATOM_LIST=$(show_workon_ebuilds);;
|
start) ATOM_LIST=$(show_workon_ebuilds);;
|
||||||
stop|iterate) ATOM_LIST=$(show_live_ebuilds);;
|
stop) ATOM_LIST=$(show_live_ebuilds);;
|
||||||
list) ;;
|
list) ;;
|
||||||
*) die "--all is invalid for the given command";;
|
*) die "--all is invalid for the given command";;
|
||||||
esac
|
esac
|
||||||
else # not selected --all
|
else # not selected --all
|
||||||
ATOM_LIST=$@
|
ATOM_LIST=$@
|
||||||
if [ -z "${ATOM_LIST}" ]; then
|
case ${WORKON_CMD} in
|
||||||
die "${WORKON_CMD}: No packages specified"
|
start|stop)
|
||||||
elif ! ATOM_LIST=$(canonicalize_names "${ATOM_LIST}"); then
|
if [ -z "${ATOM_LIST}" ]; then
|
||||||
die "Error parsing package list"
|
die "${WORKON_CMD}: No packages specified"
|
||||||
fi
|
elif ! ATOM_LIST=$(canonicalize_names "${ATOM_LIST}"); then
|
||||||
|
die "Error parsing package list"
|
||||||
|
fi;;
|
||||||
|
forall)
|
||||||
|
if [ -z "${ATOM_LIST}" ]; then
|
||||||
|
ATOM_LIST=$(show_workon_ebuilds)
|
||||||
|
elif ! ATOM_LIST=$(canonicalize_names "${ATOM_LIST}"); then
|
||||||
|
die "Error parsing package list"
|
||||||
|
fi;;
|
||||||
|
*) ;;
|
||||||
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case ${WORKON_CMD} in
|
case ${WORKON_CMD} in
|
||||||
start) ebuild_to_live "${ATOM_LIST}" ;;
|
start) ebuild_to_live "${ATOM_LIST}" ;;
|
||||||
stop) ebuild_to_stable "${ATOM_LIST}" ;;
|
stop) ebuild_to_stable "${ATOM_LIST}" ;;
|
||||||
list) [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ;;
|
list) [ ${FLAGS_all} = "${FLAGS_FALSE}" ] && show_live_ebuilds || show_workon_ebuilds ;;
|
||||||
iterate) ebuild_iterate "${ATOM_LIST}" ;;
|
forall) ebuild_forall "${ATOM_LIST}" ;;
|
||||||
*) die "invalid cros_workon command" ;;
|
*) die "invalid cros_workon command" ;;
|
||||||
esac
|
esac
|
||||||
|
Loading…
Reference in New Issue
Block a user