Skip to content

Commit

Permalink
Add some defaults from set -u
Browse files Browse the repository at this point in the history
  • Loading branch information
bdrewery committed Nov 14, 2018
1 parent e7307ce commit 5dfe24f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/share/poudriere/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ err() {
fi
# Try to set status so other processes know this crashed
# Don't set it from children failures though, only master
if [ -z "${PARALLEL_CHILD}" ] && was_a_bulk_run; then
if [ "${PARALLEL_CHILD:-0}" -eq 0 ] && was_a_bulk_run; then
if [ -n "${MY_JOBID}" ]; then
bset ${MY_JOBID} status "${EXIT_STATUS:-crashed:}" \
2>/dev/null || :
Expand Down
2 changes: 1 addition & 1 deletion src/share/poudriere/include/parallel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ _reap_children() {
local pid
local ret=0

for pid in ${PARALLEL_PIDS}; do
for pid in ${PARALLEL_PIDS-}; do
# Check if this pid is still alive
if ! kill -0 ${pid}; then
# This will error out if the return status is non-zero
Expand Down

0 comments on commit 5dfe24f

Please sign in to comment.