diff options
| author | bapt <bapt@FreeBSD.org> | 2012-06-06 22:23:17 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2012-06-06 22:23:17 +0800 |
| commit | 8296d82f8f79f33aa98bd235d5cbe600720ccce1 (patch) | |
| tree | 7cd665c6d8e4dc2c3941975a364effe4ae42bcac /Mk | |
| parent | 0ce15ef914316548b5adf745bb666e4327983fa9 (diff) | |
| download | freebsd-ports-gnome-8296d82f8f79f33aa98bd235d5cbe600720ccce1.tar.gz freebsd-ports-gnome-8296d82f8f79f33aa98bd235d5cbe600720ccce1.tar.zst freebsd-ports-gnome-8296d82f8f79f33aa98bd235d5cbe600720ccce1.zip | |
Silent rmdir after removing the optionfile, the directory might contains other
informations like distfiles (added by portmaster)
While here only check if the optionsfile is there before removing it.
PR: ports/164422
Submitted by: Greg Larkin <glarkin@freebsd.org>
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index acf685424ef2..a535cb5da4a2 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -6164,7 +6164,7 @@ showconfig-recursive: .if !target(rmconfig) rmconfig: -.if defined(OPTIONS) && exists(${OPTIONSFILE}) +.if exists(${OPTIONSFILE}) -@${ECHO_MSG} "===> Removing user-configured options for ${PKGNAME}"; \ optionsdir=${OPTIONSFILE}; optionsdir=$${optionsdir%/*}; \ if [ ${UID} != 0 -a "x${INSTALL_AS_USER}" = "x" ]; then \ @@ -6174,7 +6174,7 @@ rmconfig: ${ECHO_MSG} "===> Returning to user credentials"; \ else \ ${RM} -f ${OPTIONSFILE}; \ - ${RMDIR} $${optionsdir} || return 0; \ + ${RMDIR} $${optionsdir} 2>/dev/null || return 0; \ fi .else @${ECHO_MSG} "===> No user-specified options configured for ${PKGNAME}" |