root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

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

Browse source
This commit is contained in:
udeved 2017-02-21 23:37:09 +01:00
commit 91ad770d89
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/util-pkg.sh
View file

@ -246,6 +246,7 @@ sign_pkg(){
move_to_cache(){ move_to_cache(){
local src="$1" local src="$1"
[[ -n $PKGDEST ]] && src="$PKGDEST/$1" [[ -n $PKGDEST ]] && src="$PKGDEST/$1"
[[ ! -f $src ]] && die
msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}" msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}"
mv $src ${pkg_dir}/ mv $src ${pkg_dir}/
${sign} && sign_pkg "${src##*/}" ${sign} && sign_pkg "${src##*/}"
@ -299,10 +300,8 @@ chroot_init(){
build_pkg(){ build_pkg(){
setarch "${target_arch}" \ setarch "${target_arch}" \
mkchrootpkg ${mkchrootpkg_args[*]} || return 1 mkchrootpkg ${mkchrootpkg_args[*]}
if [ $? -eq 0 ]; then post_build
post_build
fi
} }
make_pkg(){ make_pkg(){