Commit 91ad770d authored by udeved's avatar udeved

Merge branch 'master' of github.com:manjaro/manjaro-tools into stable-0.14.x

parents 2579dc8a 6a2bf5a5
......@@ -246,6 +246,7 @@ sign_pkg(){
move_to_cache(){
local src="$1"
[[ -n $PKGDEST ]] && src="$PKGDEST/$1"
[[ ! -f $src ]] && die
msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}"
mv $src ${pkg_dir}/
${sign} && sign_pkg "${src##*/}"
......@@ -299,10 +300,8 @@ chroot_init(){
build_pkg(){
setarch "${target_arch}" \
mkchrootpkg ${mkchrootpkg_args[*]} || return 1
if [ $? -eq 0 ]; then
post_build
fi
mkchrootpkg ${mkchrootpkg_args[*]}
post_build
}
make_pkg(){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment