diff options
| author | Bryan Drewery <bryan@shatow.net> | 2014-04-24 02:27:24 +0400 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2014-04-24 02:27:24 +0400 |
| commit | 3722db4c639a0879c2da0b7e7fc1f7661d7dc704 (patch) | |
| tree | e765339f3f1f1a5319c29a50426debbf6862362f /src/share | |
| parent | 69f6fe593212265e44238a35ea18e3046f62b6ca (diff) | |
Use stopped:PORT as status for end of port builds
Diffstat (limited to 'src/share')
| -rwxr-xr-x | src/share/poudriere/common.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 7f7a2bc4..1e51c408 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -1966,7 +1966,7 @@ mark_done() { build_queue() { - local j name pkgname builders_active queue_empty + local j name pkgname builders_active queue_empty status mkfifo ${MASTERMNT}/poudriere/builders.pipe exec 6<> ${MASTERMNT}/poudriere/builders.pipe @@ -1989,7 +1989,8 @@ build_queue() { read pkgname < ${MASTERMNT}/poudriere/var/run/${j}.pkgname rm -f ${MASTERMNT}/poudriere/var/run/${j}.pid \ ${MASTERMNT}/poudriere/var/run/${j}.pkgname - if [ "$(bget ${j} status)" = "stopped:" ]; then + status=$(bget ${j} status) + if [ "${status%%:*}" = "stopped" ]; then mark_done ${pkgname} bset ${j} status "idle:" else @@ -2334,7 +2335,7 @@ stop_build() { buildlog_stop ${portdir} ${build_failed} log_stop - bset ${MY_JOBID} status "stopped:" + bset ${MY_JOBID} status "stopped:${portdir#usr/ports}" } # Crazy redirection is to add the portname into stderr. |