diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-09-18 01:49:51 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-09-18 02:46:20 +0300 |
| commit | b29131f91a00f85884f767326dda810f8a447294 (patch) | |
| tree | afa4b29f777ba9c42f65a23d8c255a52c70e3c29 /src | |
| parent | 34d41d8eebfccdfea3eb6113da2ae9e2c8512fae (diff) | |
tests: Avoid downloading /usr/src distribution
Diffstat (limited to 'src')
| -rwxr-xr-x | src/share/poudriere/jail.sh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/share/poudriere/jail.sh b/src/share/poudriere/jail.sh index 438a18c6..5ee13c17 100755 --- a/src/share/poudriere/jail.sh +++ b/src/share/poudriere/jail.sh @@ -173,8 +173,12 @@ cleanup_new_jail() { update_version() { local version_extra="$1" - eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh ` - RELEASE=${REVISION}-${BRANCH} + if [ -r "${SRC_BASE}/sys/conf/newvers.sh" ]; then + eval `grep "^[RB][A-Z]*=" ${SRC_BASE}/sys/conf/newvers.sh ` + RELEASE=${REVISION}-${BRANCH} + else + RELEASE=$(jget ${JAILNAME} version) + fi [ -n "${version_extra}" ] && RELEASE="${RELEASE} ${version_extra}" jset ${JAILNAME} version "${RELEASE}" @@ -619,7 +623,7 @@ install_from_ftp() { esac DISTS="${DISTS} base games" - [ -z "${SRCPATH}" ] && DISTS="${DISTS} src" + [ -z "${SRCPATH}" -a "${NO_SRC:-no}" = "no" ] && DISTS="${DISTS} src" DISTS="${DISTS} ${EXTRA_DISTS}" case "${V}" in |