diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-10-11 00:39:17 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-10-11 00:39:41 +0300 |
| commit | b77bccb7c05e00f54d29225ef1ec54aeeb9ca3db (patch) | |
| tree | e8f963518e653755cb15a5a752fae8e1c6147c06 /src | |
| parent | c46147bcf275fd078af1cf6fc880e49787ca44f0 (diff) | |
bset: No reason to skip passing empty MY_JOBID
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/common.sh | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index ff9c6be0..3e794407 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -77,12 +77,8 @@ err() { # Try to set status so other processes know this crashed # Don't set it from children failures though, only master 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 || : - else - bset status "${EXIT_STATUS:-crashed:}" 2>/dev/null || : - fi + bset ${MY_JOBID} status "${EXIT_STATUS:-crashed:}" \ + 2>/dev/null || : fi if [ ${1} -eq 0 ]; then msg "$2" || : @@ -3511,11 +3507,7 @@ save_wrkdir() { check-sanity|pkg-depends|fetch-depends|fetch|checksum|extract-depends|extract) return 0 ;; esac - if [ -n "${MY_JOBID}" ]; then - bset ${MY_JOBID} status "save_wrkdir:" - else - bset status "save_wrkdir:" - fi + bset ${MY_JOBID} status "save_wrkdir:" mkdir -p ${tardir} # Tar up the WRKDIR, and ignore errors @@ -7465,11 +7457,7 @@ balance_pool() { return 0 fi - if [ -n "${MY_JOBID}" ]; then - bset ${MY_JOBID} status "balancing_pool:" - else - bset status "balancing_pool:" - fi + bset ${MY_JOBID} status "balancing_pool:" # For everything ready-to-build... for pkg_dir in pool/unbalanced/*; do |