Merge branch 'enter-fakeroot' into 'master'
abuild: simplify 'Entering fakeroot' message See merge request alpine/abuild!289
This commit is contained in:
commit
7da019cd17
|
@ -2231,6 +2231,7 @@ is_function() {
|
|||
|
||||
do_fakeroot() {
|
||||
if [ -n "$FAKEROOT" ]; then
|
||||
msg "Entering fakeroot..."
|
||||
$FAKEROOT -- "$@"
|
||||
else
|
||||
"$@"
|
||||
|
@ -2240,7 +2241,6 @@ do_fakeroot() {
|
|||
# wrap check() with fakeroot
|
||||
check_fakeroot() {
|
||||
cd "$startdir"
|
||||
[ -n "$FAKEROOT" ] && msg "Entering fakeroot..."
|
||||
do_fakeroot "$abuild_path" $forceroot $color_opt $keep_build $verbose check
|
||||
}
|
||||
|
||||
|
@ -2248,7 +2248,6 @@ check_fakeroot() {
|
|||
rootpkg() {
|
||||
cd "$startdir"
|
||||
rm -rf "$pkgdir"
|
||||
[ -n "$FAKEROOT" ] && msg "Entering fakeroot..."
|
||||
|
||||
do_fakeroot "$abuild_path" $forceroot $color_opt $keep_build $verbose \
|
||||
set_source_date \
|
||||
|
|
Loading…
Reference in New Issue