diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-08-21 18:32:12 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2014-08-21 18:32:12 +0000 |
| commit | 6aeb6d51dca969627c68eace21b1dc65cb9fe4d4 (patch) | |
| tree | e67cb5f796c07d2715b3398a677c7da2f4899c8e | |
| parent | f74dca784953a1da9f799c6d73f5392891314810 (diff) | |
| download | ports-6aeb6d51dca969627c68eace21b1dc65cb9fe4d4.tar.gz ports-6aeb6d51dca969627c68eace21b1dc65cb9fe4d4.zip | |
MFH: r365576
- Make 'clean-restricted' tell that it is deleting the package.
Don't show this verbose output when calling delete-package on
failures from do-package though.
With hat: portmgr
Notes
Notes:
svn path=/branches/2014Q3/; revision=365577
| -rw-r--r-- | Mk/bsd.pkgng.mk | 2 | ||||
| -rw-r--r-- | Mk/bsd.port.mk | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 3cb19db32ffb..e7fe08ae47aa 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -265,7 +265,7 @@ do-package: ${TMPPLIST} fi; \ fi; \ else \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index f660b144dfa4..6f786a5b9459 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3783,7 +3783,7 @@ do-package: ${TMPPLIST} cd ${.CURDIR} && eval ${MAKE} package-links; \ fi; \ else \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .else @@ -3818,7 +3818,7 @@ do-package: ${TMPPLIST} fi; \ else \ [ -n "$${made_prefix}" ] && ${RMDIR} ${PREFIX}; \ - cd ${.CURDIR} && eval ${MAKE} delete-package; \ + cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi .endif @@ -3860,6 +3860,7 @@ delete-package-links: .if !target(delete-package) delete-package: delete-package-links + @${ECHO_MSG} "===> Deleting package for ${PKGNAME}" . if defined(NO_STAGE) @${RM} -f ${PKGFILE} . else |