bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: use BUILDFILE rather than BUILDSCRIPT

Browse source 
In check_sanity, BUILDFILE needs to be checked rather than
BUILDSCRIPT.

Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Allan McRae 2010-06-09 16:48:50 +10:00
parent b886362282
commit d73d055c6f
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/makepkg.sh.in
View file

@ -1237,7 +1237,7 @@ check_sanity() {
local i local i
for i in 'changelog' 'install'; do for i in 'changelog' 'install'; do
local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") local filelist=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE")
local file local file
for file in $filelist; do for file in $filelist; do
# evaluate any bash variables used # evaluate any bash variables used
@ -1280,7 +1280,7 @@ check_sanity() {
if [[ -n "${PKGLIST[@]}" ]]; then if [[ -n "${PKGLIST[@]}" ]]; then
for pkg in ${PKGLIST[@]}; do for pkg in ${PKGLIST[@]}; do
if ! in_array $pkg ${pkgname[@]}; then if ! in_array $pkg ${pkgname[@]}; then
error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDSCRIPT" error "$(gettext "requested package %s is not provided in %s")" "$pkg" "$BUILDFILE"
return 1 return 1
fi fi
done done