mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-19 08:13:21 +00:00
Revert usage of -x for rm(1) for now due to 9.x not having it.
This commit is contained in:
parent
1d7ea38f94
commit
9db7964a0e
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=402690
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= poudriere
|
||||
DISTVERSION= 3.1.99.20151125
|
||||
PORTREVISION= 0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
|
||||
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- src/share/poudriere/common.sh.orig 2015-11-30 17:26:13 UTC
|
||||
+++ src/share/poudriere/common.sh
|
||||
@@ -1856,7 +1856,7 @@ jail_stop() {
|
||||
fi
|
||||
msg "Umounting file systems"
|
||||
destroyfs ${MASTERMNT} jail || :
|
||||
- rm -rfx ${MASTERMNT}/../
|
||||
+ rm -rf ${MASTERMNT}/../
|
||||
export STATUS=0
|
||||
|
||||
# Don't override if there is a failure to grab the last status.
|
@ -0,0 +1,10 @@
|
||||
--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:26:08 UTC
|
||||
+++ src/share/poudriere/include/fs.sh
|
||||
@@ -181,6 +181,6 @@ destroyfs() {
|
||||
rmdir ${mnt}
|
||||
else
|
||||
chflags -R noschg ${mnt}
|
||||
- rm -rfx ${mnt}
|
||||
+ rm -rf ${mnt}
|
||||
fi
|
||||
}
|
@ -2,7 +2,7 @@
|
||||
|
||||
PORTNAME= poudriere
|
||||
DISTVERSION= 3.1.10
|
||||
PORTREVISION= 0
|
||||
PORTREVISION= 1
|
||||
CATEGORIES= ports-mgmt
|
||||
MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
|
||||
http://mirror.shatow.net/freebsd/${PORTNAME}/ \
|
||||
|
@ -0,0 +1,11 @@
|
||||
--- src/share/poudriere/common.sh.orig 2015-11-30 17:25:11 UTC
|
||||
+++ src/share/poudriere/common.sh
|
||||
@@ -1847,7 +1847,7 @@ jail_stop() {
|
||||
fi
|
||||
msg "Umounting file systems"
|
||||
destroyfs ${MASTERMNT} jail || :
|
||||
- rm -rfx ${MASTERMNT}/../
|
||||
+ rm -rf ${MASTERMNT}/../
|
||||
export STATUS=0
|
||||
|
||||
# Don't override if there is a failure to grab the last status.
|
@ -0,0 +1,10 @@
|
||||
--- src/share/poudriere/include/fs.sh.orig 2015-11-30 17:25:11 UTC
|
||||
+++ src/share/poudriere/include/fs.sh
|
||||
@@ -181,6 +181,6 @@ destroyfs() {
|
||||
rmdir ${mnt}
|
||||
else
|
||||
chflags -R noschg ${mnt}
|
||||
- rm -rfx ${mnt}
|
||||
+ rm -rf ${mnt}
|
||||
fi
|
||||
}
|
Loading…
Reference in New Issue
Block a user