From c0b80b26b5a8ce2b42d28f5dc083e5b1fb9f370b Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Tue, 12 May 2020 20:13:38 +0200 Subject: [PATCH] pmb.aportgen.core.rewrite: no lines with empty val (MR 1942) Avoid apkbuild-lint errors like: [AL5]:APKBUILD:15:variable set to empty string --- pmb/aportgen/core.py | 6 +++++- .../aportgen/pmaports/cross/binutils-armhf/APKBUILD | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pmb/aportgen/core.py b/pmb/aportgen/core.py index 736ff91b..1e6fcd7e 100644 --- a/pmb/aportgen/core.py +++ b/pmb/aportgen/core.py @@ -118,7 +118,11 @@ def rewrite(args, pkgname, path_original="", fields={}, replace_pkgname=None, # Replace fields for key, value in fields.items(): if line.startswith(key + "="): - line = key + "=\"" + value + "\"\n" + if value: + line = key + "=\"" + value + "\"\n" + else: + # Remove line without value to avoid lint error + line = "" break # Replace $pkgname diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD index 065a6371..6128a3a6 100644 --- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD @@ -8,12 +8,9 @@ pkgrel=1 pkgdesc="Tools necessary to build programs for armhf targets" url="https://www.gnu.org/software/binutils/" depends="" -makedepends_build="" -makedepends_host="" makedepends="gettext libtool autoconf automake bison texinfo" arch="armv7 aarch64 x86_64 x86" license="GPL-2.0 GPL-3.0-or-later LGPL-2.0 BSD" -subpackages="" source="https://ftp.gnu.org/gnu/binutils/binutils-$pkgver.tar.bz2 x86-Add-a-GNU_PROPERTY_X86_ISA_1_USED-note-if-needed.patch x86-Properly-merge-GNU_PROPERTY_X86_ISA_1_USED.patch