[pacman-dev] [PATCH] makepkg: use BUILDFILE rather than BUILDSCRIPT
In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT. Signed-off-by: Allan McRae <allan@archlinux.org> --- First error found by the future makepkg test suite! scripts/makepkg.sh.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d6d1f6..b166f9d 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1237,7 +1237,7 @@ check_sanity() { local i for i in 'changelog' 'install'; do - local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDSCRIPT") + local $i=$(sed -n "s/^[[:space:]]*$i=//p" "$BUILDFILE") local file for file in ${!i}; do # evaluate any bash variables used @@ -1280,7 +1280,7 @@ check_sanity() { if [[ -n "${PKGLIST[@]}" ]]; then for pkg in ${PKGLIST[@]}; do 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 fi done -- 1.7.1
On 09/06/10 16:50, Allan McRae wrote:
In check_sanity, BUILDFILE needs to be checked rather than BUILDSCRIPT.
Signed-off-by: Allan McRae<allan@archlinux.org> ---
First error found by the future makepkg test suite!
And of course given the day I am having, that was based off master rather than after the other patches already submitted. Fixed on my working branch. Allan
participants (1)
-
Allan McRae