[pacman-dev] [PATCH] makepkg: check for non-empty pkgbase instead of pkgname

[Dan McGee]

On Wed, Oct 21, 2009 at 9:06 AM, Cedric Staniewski <cedric at gmx.ca> wrote:
> pkgbase is used in the following rm calls, and since pkgname can be
> present when pkgbase is not, it is safer to check for pkgbase.
>
> Signed-off-by: Cedric Staniewski <cedric at gmx.ca>
Looks good to me, Allan?

-Dan

> ---
>  scripts/makepkg.sh.in |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 3b29b31..e18ab15 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -156,7 +156,7 @@ clean_up() {
>                # If it's a clean exit and -c/--clean has been passed...
>                msg "$(gettext "Cleaning up...")"
>                rm -rf "$pkgdir" "$srcdir"
> -               if [ -n "$pkgname" ]; then
> +               if [ -n "$pkgbase" ]; then
>                        # Can't do this unless the BUILDSCRIPT has been sourced.
>                        rm -f "${pkgbase}-${pkgver}-${pkgrel}-${CARCH}-build.log"*
>                        if [ "$PKGFUNC" -eq 1 ]; then
> --
> 1.6.5.1
>
>
>