Mail archive
alpine-aports

Re: [alpine-aports] [PATCH] testing/drbd9-grsec: fix prepare logic

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Wed, 6 Jan 2016 14:09:06 +0100

On Tue, 5 Jan 2016 18:25:36 +0100
Roland Kammerer <roland.kammerer_at_linbit.com> wrote:

> - We have to add additional ".." to the path we want to check. $PWD is
> already $srcdir. This bug was the only reason that it did not trigger
> futher bugs in the "true" case.
> - If we don't find an APKBUILD for the kernel flavor, error out
> - We are in a sub-shell, we do not have to protect $pkgname
> - We have to add "return 0", otherwise in the positive case where the
> last check succeeds, it sets the sub-shell return value to 1, which
> then triggers the failure path.
> ---
> testing/drbd9-grsec/APKBUILD | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/testing/drbd9-grsec/APKBUILD b/testing/drbd9-grsec/APKBUILD
> index b9922c0..258163c 100644
> --- a/testing/drbd9-grsec/APKBUILD
> +++ b/testing/drbd9-grsec/APKBUILD
> _at_@ -33,14 +33,15 @@ _builddir=$srcdir/$_usname-$_usver
> prepare() {
> local i
> # verify the kernel version
> - (if [ -f ../../main/linux-${_flavor}/APKBUILD ]; then
> - _name=$pkgname
> - . ../../main/linux-${_flavor}/APKBUILD
> - pkgname=$_name
> + (if [ -f ../../../main/linux-${_flavor}/APKBUILD ]; then
> + . ../../../main/linux-${_flavor}/APKBUILD

I think we want a "cd $startdir" instead

> [ "$_kver" != "$pkgver" ] \
> && die "please update _kver to $pkgver"
> [ "$_kpkgrel" != "$pkgrel" ] \
> && die "please update _kpkgrel to $pkgrel"
> + return 0
> + else
> + die "could not determine kernel flavor: linux-${_flavor}"
> fi) || return 1
>

maybe move the return 0 til right before the closing )?
  
-nc


---
Unsubscribe:  alpine-aports+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-aports+help_at_lists.alpinelinux.org
---
Received on Wed Jan 06 2016 - 14:09:06 GMT