diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2021-12-01 20:45:35 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-01 20:45:35 +0300 |
| commit | 4ef8d404051450fdefee8694ad3a6f7f34f4ef89 (patch) | |
| tree | 65bbe09a4de9ce3f4c2895799ce447c50bf493f3 /src/share | |
| parent | 164d0127cec116aa7f4be7236144be2f0696f9a2 (diff) | |
| parent | 068a8789988544a4dbd44ee37accf616ea56ffdf (diff) | |
Merge pull request #953 from AMDmi3/allow-disable-log-grepping
Allow to disable grepping logs for failure reason
Diffstat (limited to 'src/share')
| -rwxr-xr-x | src/share/poudriere/common.sh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 67c84682..af13d175 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -5093,7 +5093,7 @@ build_pkg() { local failed_status failed_phase local clean_rdepends local log - local errortype + local errortype="???" local ret=0 local tmpfs_blacklist_dir local elapsed now pkgname_varname jpkg originspec @@ -5223,9 +5223,11 @@ build_pkg() { # Symlink the buildlog into errors/ ln -s "../${pkgname}.log" \ "${log}/logs/errors/${pkgname}.log" - errortype=$(/bin/sh ${SCRIPTPREFIX}/processonelog.sh \ - "${log}/logs/errors/${pkgname}.log" \ - 2> /dev/null) + if [ "${DETERMINE_BUILD_FAILURE_REASON}" = "yes" ]; then + errortype=$(/bin/sh ${SCRIPTPREFIX}/processonelog.sh \ + "${log}/logs/errors/${pkgname}.log" \ + 2> /dev/null) + fi badd ports.failed "${originspec} ${pkgname} ${failed_phase} ${errortype} ${elapsed}" COLOR_ARROW="${COLOR_FAIL}" job_msg "${COLOR_FAIL}Finished ${COLOR_PORT}${port}${FLAVOR:+@${FLAVOR}} | ${pkgname}${COLOR_FAIL}: Failed: ${COLOR_PHASE}${failed_phase}" run_hook pkgbuild failed "${port}" "${pkgname}" "${failed_phase}" \ @@ -8913,6 +8915,7 @@ fi : ${FORCE_MOUNT_HASH:=no} : ${DELETE_UNQUEUED_PACKAGES:=no} : ${DELETE_UNKNOWN_FILES:=yes} +: ${DETERMINE_BUILD_FAILURE_REASON:=yes} DRY_RUN=0 INTERACTIVE_MODE=0 |