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.
This commit is contained in:
parent
b0f60ee85a
commit
1c017bb5d5
|
@ -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) {
|
||||
|
|
Loading…
Reference in New Issue