jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Finally fix fakeroot on Arch linux, return on errors while processing deps.

Browse source
This commit is contained in:
Juan RP 2010-05-10 12:09:06 +02:00
parent 2850e6ed79
commit 2ee55de018
3 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
xbps-src/shutils/builddep_funcs.sh
View file

@ -73,7 +73,7 @@ install_pkg_deps()
# Iterate again, this will check if there are more # Iterate again, this will check if there are more
# required deps for current pkg. # required deps for current pkg.
# #
install_pkg_deps $j $curpkg install_pkg_deps $j $curpkg || return $?
prev_pkg="$j" prev_pkg="$j"
done done
@ -84,10 +84,10 @@ install_pkg_deps()
return $? return $?
elif [ $? -eq 1 ]; then elif [ $? -eq 1 ]; then
# Package not found, build from source. # Package not found, build from source.
install_pkg $curpkgname install_pkg $curpkgname || return $?
fi fi
else else
install_pkg $curpkgname install_pkg $curpkgname || return $?
fi fi
[ -n "$prev_pkg" ] && unset prev_pkg [ -n "$prev_pkg" ] && unset prev_pkg
} }
@ -178,13 +178,13 @@ install_dependencies_pkg()
continue continue
else else
# package not found, build source. # package not found, build source.
install_pkg $pkgn install_pkg $pkgn || return $?
fi fi
else else
install_pkg $pkgn install_pkg $pkgn || return $?
fi fi
else else
install_pkg_deps "${i}" $pkg install_pkg_deps "${i}" $pkg || return $?
fi fi
done done
} }

5
xbps-src/shutils/pkgtarget_funcs.sh.in
View file

@ -64,8 +64,7 @@ install_pkg()
# Install dependencies required by this package. # Install dependencies required by this package.
# #
if [ -z "$doing_deps" ]; then if [ -z "$doing_deps" ]; then
install_dependencies_pkg $pkg install_dependencies_pkg $pkg || return $?
[ $? -ne 0 ] && return $?
# #
# At this point all required deps are installed, and # At this point all required deps are installed, and
# only remaining is the origin package; install it. # only remaining is the origin package; install it.
@ -98,7 +97,7 @@ install_pkg()
# Install pkg into destdir. # Install pkg into destdir.
set_build_vars set_build_vars
env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \ env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \
dontrm_builddir=${dontrm_builddir} \ dontrm_builddir=${dontrm_builddir} wrksrc=${wrksrc} \
${fakeroot_cmd} ${fakeroot_cmd_args} \ ${fakeroot_cmd} ${fakeroot_cmd_args} \
@@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper \ @@XBPS_INSTALL_LIBEXECDIR@@/xbps-src-doinst-helper \
${curpkgn} || return $? ${curpkgn} || return $?

1
xbps-src/shutils/tmpl_funcs.sh.in
View file

@ -111,6 +111,7 @@ setup_tmpl()
reset_tmpl_vars reset_tmpl_vars
. $XBPS_SRCPKGDIR/${pkg}/template . $XBPS_SRCPKGDIR/${pkg}/template
prepare_tmpl prepare_tmpl
set_build_vars
else else
msg_error "Cannot find $pkg build template file." msg_error "Cannot find $pkg build template file."
fi fi