From ff50a5e382fe29edff31f5937f5ce2fd86993fa0 Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Sat, 14 Sep 2019 01:26:49 +0200 Subject: [PATCH] aportgen: fix extra newline (!1811) --- pmb/aportgen/core.py | 10 ++++++---- .../aportgen/pmaports/cross/binutils-armhf/APKBUILD | 1 - 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pmb/aportgen/core.py b/pmb/aportgen/core.py index fe75b6ec..418a4b00 100644 --- a/pmb/aportgen/core.py +++ b/pmb/aportgen/core.py @@ -91,10 +91,12 @@ def rewrite(args, pkgname, path_original, fields={}, replace_pkgname=None, "# Based on: " + path_original + "\n", "\n", ] - for line in below_header.split("\n"): - if not line[:8].strip(): - line = line[8:] - lines_new += line.rstrip() + "\n" + + if below_header: + for line in below_header.split("\n"): + if not line[:8].strip(): + line = line[8:] + lines_new += line.rstrip() + "\n" # Copy/modify lines, skip Maintainer/Contributor path = args.work + "/aportgen/APKBUILD" diff --git a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD index 887e2dcc..51cae645 100644 --- a/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD +++ b/test/testdata/aportgen/pmaports/cross/binutils-armhf/APKBUILD @@ -2,7 +2,6 @@ # Generator: pmbootstrap aportgen binutils-armhf # Based on: main/binutils - pkgname="binutils-armhf" pkgver=2.31.1 pkgrel=1