moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: improve msg_* funcs and update all callers.

Browse source
This commit is contained in:
Juan RP 2010-12-20 00:22:12 +01:00
parent 24c7ac6808
commit 3da3783333
27 changed files with 184 additions and 173 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ setup_tmpl()
. $XBPS_SRCPKGDIR/${pkg}/template
prepare_tmpl
else
msg_error "Cannot find $pkg build template file."
msg_error "Cannot find $pkg build template file.\n"
fi
}
@ -138,10 +138,10 @@ Add_dependency()
case "$type" in
build|full|run) ;;
*) msg_error "Unknown dependency type for $pkgname." ;;
*) msg_error "Unknown dependency type for $pkgname.\n" ;;
esac
[ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!"
[ -z "$pkgname" ] && msg_error "Add_dependency: pkgname empty!\n"
if [ -f $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends ]; then
. $XBPS_SRCPKGDIR/${pkgname}/${pkgname}.depends
@ -205,7 +205,7 @@ prepare_tmpl()
for i in ${REQ_VARS}; do
eval val="\$$i"
if [ -z "$val" -o -z "$i" ]; then
msg_error "\"$i\" not set on $pkgname template."
msg_error "\"$i\" not set on $pkgname template.\n"
fi
done
@ -213,7 +213,7 @@ prepare_tmpl()
[ "$i" = "$xbps_machine" ] && found=si && break
done
if [ -n "${only_for_archs}" -a -z "$found" ]; then
msg_error "this package is only for: ${only_for_archs}."
msg_error "this package is only for: ${only_for_archs}.\n"
fi
unset XBPS_EXTRACT_DONE XBPS_APPLYPATCHES_DONE
@ -246,7 +246,7 @@ remove_tmpl_wrksrc()
return 1
fi
msg_normal "Cleaning '${sourcepkg}' build directory... "
msg_normal "Cleaning '${sourcepkg}' build directory...\n"
rm -rf $lwrksrc
return $?
}