diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2014-04-25 06:31:24 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2014-04-25 06:31:24 +0800 |
| commit | 6a8a5ae22ebd90ecfd548373d6388510115efcfd (patch) | |
| tree | 50bad8ace2d15c0edfeed0b5c7cbfb700049cc5a /Mk | |
| parent | 492b610c65e5770f70f62400a24ac8bc7e69d334 (diff) | |
| download | freebsd-ports-gnome-6a8a5ae22ebd90ecfd548373d6388510115efcfd.tar.gz freebsd-ports-gnome-6a8a5ae22ebd90ecfd548373d6388510115efcfd.tar.zst freebsd-ports-gnome-6a8a5ae22ebd90ecfd548373d6388510115efcfd.zip | |
- Fix false-positive orphanned dir when '@unexec rmdir -p' is used.
Reported by: antoine
With hat: portmgr
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/Scripts/check-stagedir.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mk/Scripts/check-stagedir.sh b/Mk/Scripts/check-stagedir.sh index 1838cf64e831..d6e6c78ebeb6 100644 --- a/Mk/Scripts/check-stagedir.sh +++ b/Mk/Scripts/check-stagedir.sh @@ -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 |