From 77d39ecdf1e15d434ea9ee5d018131415b01d2de Mon Sep 17 00:00:00 2001
From: BO41 <botbob@disroot.org>
Date: Mon, 23 Aug 2021 08:14:10 +0200
Subject: [PATCH] lint: enforce max line length (MR 2097)

---
 pmb/aportgen/busybox_static.py |  3 ++-
 pmb/aportgen/grub_efi.py       |  3 ++-
 pmb/aportgen/linux.py          |  8 +++++---
 pmb/aportgen/musl.py           | 11 +++++++----
 test/static_code_analysis.sh   | 15 +--------------
 5 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/pmb/aportgen/busybox_static.py b/pmb/aportgen/busybox_static.py
index 33744bbc..dc6b9eb6 100644
--- a/pmb/aportgen/busybox_static.py
+++ b/pmb/aportgen/busybox_static.py
@@ -27,6 +27,7 @@ def generate(args, pkgname):
     channel_cfg = pmb.config.pmaports.read_config_channel(args)
     mirrordir = channel_cfg["mirrordir_alpine"]
     apkbuild_path = f"{args.work}/chroot_native/{tempdir}/APKBUILD"
+    apk_name = f"busybox-static-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk"
     with open(apkbuild_path, "w", encoding="utf-8") as handle:
         apkbuild = f"""\
             # Automatically generated aport, do not edit!
@@ -58,7 +59,7 @@ def generate(args, pkgname):
             package() {{
                 mkdir -p "$pkgdir/usr/$_target"
                 cd "$pkgdir/usr/$_target"
-                tar -xf $srcdir/busybox-static-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk
+                tar -xf $srcdir/{apk_name}
                 rm .PKGINFO .SIGN.*
             }}
         """
diff --git a/pmb/aportgen/grub_efi.py b/pmb/aportgen/grub_efi.py
index 579bd987..1c831b0f 100644
--- a/pmb/aportgen/grub_efi.py
+++ b/pmb/aportgen/grub_efi.py
@@ -27,6 +27,7 @@ def generate(args, pkgname):
     channel_cfg = pmb.config.pmaports.read_config_channel(args)
     mirrordir = channel_cfg["mirrordir_alpine"]
     apkbuild_path = f"{args.work}/chroot_native/{tempdir}/APKBUILD"
+    apk_name = f'"$srcdir/grub-efi-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk"'
     with open(apkbuild_path, "w", encoding="utf-8") as handle:
         apkbuild = f"""\
             # Automatically generated aport, do not edit!
@@ -48,7 +49,7 @@ def generate(args, pkgname):
             package() {{
                 mkdir -p "$pkgdir"
                 cd "$pkgdir"
-                tar -xf "$srcdir/grub-efi-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk"
+                tar -xf {apk_name}
                 rm .PKGINFO .SIGN.*
             }}
         """
diff --git a/pmb/aportgen/linux.py b/pmb/aportgen/linux.py
index eba88133..8eced1e2 100644
--- a/pmb/aportgen/linux.py
+++ b/pmb/aportgen/linux.py
@@ -19,7 +19,8 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
                 KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-postmarketOS\""""
 
     package = """
-            downstreamkernel_package "$builddir" "$pkgdir" "$_carch" "$_flavor" "$_outdir\""""
+            downstreamkernel_package "$builddir" "$pkgdir" "$_carch\" \\
+                "$_flavor" "$_outdir\""""
 
     if deviceinfo["bootimg_qcdt"] == "true":
         build += """\n
@@ -36,9 +37,10 @@ def generate_apkbuild(args, pkgname, deviceinfo, patches):
         elif soc_vendor == "exynos":
             codename = "-".join(pkgname.split("-")[2:])
             makedepends.append("dtbtool-exynos")
-            build += f"""
+            build += """
             dtbTool-exynos -o "$_outdir/arch/$_carch/boot"/dt.img \\
-                $(find "$_outdir/arch/$_carch/boot/dts/" -name *{codename}*.dtb)"""
+                $(find "$_outdir/arch/$_carch/boot/dts/\""""
+            build += f" -name *{codename}*.dtb)"
         else:
             makedepends.append("dtbtool")
             build += """
diff --git a/pmb/aportgen/musl.py b/pmb/aportgen/musl.py
index c6cb969f..85f67351 100644
--- a/pmb/aportgen/musl.py
+++ b/pmb/aportgen/musl.py
@@ -27,6 +27,8 @@ def generate(args, pkgname):
     channel_cfg = pmb.config.pmaports.read_config_channel(args)
     mirrordir = channel_cfg["mirrordir_alpine"]
     apkbuild_path = f"{args.work}/chroot_native/{tempdir}/APKBUILD"
+    apk_name = f"$srcdir/musl-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk"
+    apk_dev_name = f"$srcdir/musl-dev-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk"
     with open(apkbuild_path, "w", encoding="utf-8") as handle:
         apkbuild = f"""\
             # Automatically generated aport, do not edit!
@@ -63,7 +65,7 @@ def generate(args, pkgname):
                 cd "$pkgdir/usr/$_target"
                 # Use 'busybox tar' to avoid 'tar: Child returned status 141'
                 # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-                busybox tar -xf $srcdir/musl-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk
+                busybox tar -xf {apk_name}
                 rm .PKGINFO .SIGN.*
             }}
             package_dev() {{
@@ -71,11 +73,12 @@ def generate(args, pkgname):
                 cd "$subpkgdir/usr/$_target"
                 # Use 'busybox tar' to avoid 'tar: Child returned status 141'
                 # on some machines (builds.sr.ht, gitlab-ci). See pmaports#26.
-                busybox tar -xf $srcdir/musl-dev-$pkgver-r$pkgrel-$_arch-{mirrordir}.apk
+                busybox tar -xf {apk_dev_name}
                 rm .PKGINFO .SIGN.*
 
-                # symlink everything from /usr/$_target/usr/* to /usr/$_target/*
-                # so the cross-compiler gcc does not fail to build.
+                # symlink everything from /usr/$_target/usr/*
+                # to /usr/$_target/* so the cross-compiler gcc does not fail
+                # to build.
                 for _dir in include lib; do
                     mkdir -p "$subpkgdir/usr/$_target/$_dir"
                     cd "$subpkgdir/usr/$_target/usr/$_dir"
diff --git a/test/static_code_analysis.sh b/test/static_code_analysis.sh
index 3f6b1822..e3258be2 100755
--- a/test/static_code_analysis.sh
+++ b/test/static_code_analysis.sh
@@ -32,7 +32,6 @@ while read -r file; do
 done
 
 # Python: flake8
-# E501: max line length
 # F401: imported, but not used, does not make sense in __init__ files
 # E402: module import not on top of file, not possible for testcases
 # E722: do not use bare except
@@ -40,23 +39,11 @@ cd "$DIR"/..
 echo "Test with flake8: *.py"
 # Note: omitting a virtualenv if it is here (e.g. gitlab CI)
 py_files="$(find . -not -path '*/venv/*' -name '*.py')"
-_ignores="E501,E402,E722,W504,W605"
+_ignores="E402,E722,W504,W605"
 # shellcheck disable=SC2086
 $flake8_command --exclude=__init__.py --ignore "$_ignores" $py_files
 # shellcheck disable=SC2086
 $flake8_command --filename=__init__.py --ignore "F401,$_ignores" $py_files
 
-# Enforce max line length of 79 characters (#1986). We are iteratively fixing
-# up the source files to adhere to this rule, so ignore the ones that are not
-# yet fixed. Eventually, E501 can be removed from _ignores above, and this
-# whole block can be removed.
-echo "Test with flake8: *.py (E501)"
-exc_files="./pmb/aportgen/busybox_static.py"
-exc_files="$exc_files,./pmb/aportgen/grub_efi.py"
-exc_files="$exc_files,./pmb/aportgen/linux.py"
-exc_files="$exc_files,./pmb/aportgen/musl.py"
-# shellcheck disable=SC2086
-$flake8_command --select="E501" --exclude=$exc_files $py_files
-
 # Done
 echo "Success!"