Date: Thu, 24 Apr 2014 22:31:24 +0000 (UTC) From: Bryan Drewery <bdrewery@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r352074 - head/Mk/Scripts Message-ID: <201404242231.s3OMVOda074940@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bdrewery Date: Thu Apr 24 22:31:24 2014 New Revision: 352074 URL: http://svnweb.freebsd.org/changeset/ports/352074 QAT: https://qat.redports.org/buildarchive/r352074/ Log: - Fix false-positive orphanned dir when '@unexec rmdir -p' is used. Reported by: antoine With hat: portmgr Modified: head/Mk/Scripts/check-stagedir.sh Modified: head/Mk/Scripts/check-stagedir.sh ============================================================================== --- head/Mk/Scripts/check-stagedir.sh Thu Apr 24 22:30:05 2014 (r352073) +++ head/Mk/Scripts/check-stagedir.sh Thu Apr 24 22:31:24 2014 (r352074) @@ -53,9 +53,9 @@ parse_plist() { @dirrm*|'@unexec rmdir'*|'@unexec /bin/rmdir'*) line="$(printf %s "$line" \ | sed -Ee 's/\|\|.*//;s|[[:space:]]+[0-9]*[[:space:]]*>[&]?[[:space:]]*[^[:space:]]+||g' \ - -e "/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|([^%])%D([^%])|\1${PREFIX}\2|g" \ - -e '/^@unexec[[:space:]]+(\/bin\/)?rmdir/s|"(.*)"[[:space:]]*|\1|g' \ - -e 's/@unexec[[:space:]]+(\/bin\/)?rmdir[[:space:]]+//' \ + -e "/^@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?/s|([^%])%D([^%])|\1${PREFIX}\2|g" \ + -e '/^@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?/s|"(.*)"[[:space:]]*|\1|g' \ + -e 's/@unexec[[:space:]]+(\/bin\/)?rmdir( -p)?[[:space:]]+//' \ -e 's/@dirrm(try)?[[:space:]]+//' \ -e 's/[[:space:]]+$//')" case "$line" in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404242231.s3OMVOda074940>