From 1c017bb5d51207a0af4a75d24ec9060f6e72ed41 Mon Sep 17 00:00:00 2001 From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org> Date: Sun, 28 Jan 2024 02:50:19 +0000 Subject: [PATCH] apkbuild-cpan.in: add newline after inserting *depends= Upon `apkbuild-cpan upgrade`, an aport without any checkdepends would get a line like this inserted: `checkdepends=""subpackages="$pkgname-doc"` which would then be deleted by the substitution that removes empty variables, so the net result is an APKBUILD with the subpackages field removed. Inserting a newline results in `checkdepends=""` being a line all by itself, which then gets correctly removed by the empty variables regex. --- apkbuild-cpan.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apkbuild-cpan.in b/apkbuild-cpan.in index 5359393..899f4b3 100755 --- a/apkbuild-cpan.in +++ b/apkbuild-cpan.in @@ -651,15 +651,15 @@ sub do_depends { or die "Can't find license line in APKBUILD"; } $text =~ s/^depends=\"([^\"]*)\"$/depends=\"$deps\"/mg - or $text =~ s/(license=.*\n)/$1depends=\"$deps\"/gm + or $text =~ s/(license=.*\n)/$1depends=\"$deps\"\n/gm or die "Can't insert depends line in APKBUILD" if defined $deps; $text =~ s/^makedepends=\"([^\"]*)\"$/makedepends=\"$makedeps\"/mg - or $text =~ s/(depends=.*\n)/$1makedepends=\"$makedeps\"/gm + or $text =~ s/(depends=.*\n)/$1makedepends=\"$makedeps\"\n/gm or die "Can't insert makedepends line in APKBUILD" if defined $makedeps; $text =~ s/^checkdepends=\"([^\"]*)\"$/checkdepends=\"$checkdeps\"/mg - or $text =~ s/(makedepends=.*\n)/$1checkdepends=\"$checkdeps\"/gm + or $text =~ s/(makedepends=.*\n)/$1checkdepends=\"$checkdeps\"\n/gm or die "Can't insert checkdepends line in APKBUILD" if defined $checkdeps; if (defined $builddir) {