diff options
| author | Bryan Drewery <bryan@shatow.net> | 2014-04-17 02:19:25 +0400 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2014-04-17 02:19:25 +0400 |
| commit | c153a7a32f3337da42da32b278c649132dbde723 (patch) | |
| tree | 4111a9d3280fa9a07c3eb7164c2a4a3f85b57623 | |
| parent | 01a23b071cc0dffcd9c5dda423a74257a64bcc44 (diff) | |
testport -i: Fix double installing of package error
| -rwxr-xr-x | src/share/poudriere/testport.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/share/poudriere/testport.sh b/src/share/poudriere/testport.sh index 1847ea2b..5e588866 100755 --- a/src/share/poudriere/testport.sh +++ b/src/share/poudriere/testport.sh @@ -234,11 +234,6 @@ else update_stats fi -if [ -f ${MASTERMNT}/tmp/pkgs/${PKGNAME}.${PKG_EXT} ]; then - msg "Installing from package" - injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT} || : -fi - if [ ${INTERACTIVE_MODE} -gt 0 ]; then # Stop the tee process and stop redirecting stdout so that # the terminal can be properly used in the jail @@ -257,6 +252,11 @@ if [ ${INTERACTIVE_MODE} -gt 0 ]; then elif [ ${INTERACTIVE_MODE} -eq 2 ]; then exit 0 fi +else + if [ -f ${MASTERMNT}/tmp/pkgs/${PKGNAME}.${PKG_EXT} ]; then + msg "Installing from package" + injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT} || : + fi fi msg "Cleaning up" |