debian/bin, debian/rules.real: Add symlink to Python package directory instead of editing path

This fixes one of the remaining classes of pycodestyle errors.

10 files changed, 3 insertions, 8 deletions

diff --git a/debian/bin/abiupdate.py b/debian/bin/abiupdate.py
index 049d8bbe4845..c9e5df75ab8b 100755
--- a/debian/bin/abiupdate.py
+++ b/debian/bin/abiupdate.py
@@ -9,7 +9,6 @@ import tempfile
 from urllib.request import urlopen
 from urllib.error import HTTPError
 
-sys.path.append(sys.path[0] + "/../lib/python")
 from debian_linux.abi import Symbols
 from debian_linux.config import *
 from debian_linux.debian import *
diff --git a/debian/bin/buildcheck.py b/debian/bin/buildcheck.py
index c9c5bafce19b..5c999d0f87eb 100755
--- a/debian/bin/buildcheck.py
+++ b/debian/bin/buildcheck.py
@@ -5,7 +5,6 @@ import fnmatch
 import glob
 import stat
 
-sys.path.append('debian/lib/python')
 from debian_linux.abi import Symbols
 from debian_linux.config import ConfigCoreDump
 from debian_linux.debian import *
diff --git a/debian/bin/debian_linux b/debian/bin/debian_linux
new file mode 120000
index 000000000000..01f3e04dc7a6
--- /dev/null
+++ b/debian/bin/debian_linux
@@ -0,0 +1 @@
+../lib/python/debian_linux/
\ No newline at end of file
diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index fd8072d04ff7..efe83012ac0c 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -9,7 +9,6 @@ import os
 import os.path
 import subprocess
 
-sys.path.append("debian/lib/python")
 from debian_linux import config
 from debian_linux.debian import *
 from debian_linux.gencontrol import Gencontrol as Base, merge_packages
diff --git a/debian/bin/gencontrol_signed.py b/debian/bin/gencontrol_signed.py
index f3b0fbade672..a7a781e1878b 100755
--- a/debian/bin/gencontrol_signed.py
+++ b/debian/bin/gencontrol_signed.py
@@ -11,7 +11,6 @@ import subprocess
 import sys
 import time
 
-sys.path.append("debian/lib/python")
 from debian_linux.config import ConfigCoreDump
 from debian_linux.debian import Changelog, PackageDescription, VersionLinux, \
     Package, PackageRelationGroup
diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py
index d45b53b15b64..980503eb4f76 100755
--- a/debian/bin/genorig.py
+++ b/debian/bin/genorig.py
@@ -11,7 +11,6 @@ import subprocess
 import time
 import warnings
 
-sys.path.append("debian/lib/python")
 from debian_linux.debian import Changelog, VersionLinux
 
 
diff --git a/debian/bin/getconfig.py b/debian/bin/getconfig.py
index bb1e713fad25..b719a17a1299 100755
--- a/debian/bin/getconfig.py
+++ b/debian/bin/getconfig.py
@@ -2,7 +2,6 @@
 
 import sys
 
-sys.path.append(sys.path[0] + "/../lib/python")
 from debian_linux.config import ConfigCoreDump
 
 section = tuple(s or None for s in sys.argv[1:-1])
diff --git a/debian/bin/stable-update b/debian/bin/stable-update
index 91ed9c9fd17b..049c1326421b 100755
--- a/debian/bin/stable-update
+++ b/debian/bin/stable-update
@@ -5,7 +5,6 @@ import os
 import re
 import subprocess
 
-sys.path.append(sys.path[0] + "/../lib/python")
 from debian_linux.debian import Changelog, VersionLinux
 
 
diff --git a/debian/changelog b/debian/changelog
index a3355fb7bfb4..a402a2f12568 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ linux (4.19~rc6-1~exp1) UNRELEASED; urgency=medium
   * [ppc64el] udeb: Fix relative #include filenames in kernel-image module
     list (really fixes FTBFS?)
   * debian/bin, debian/lib/python: Fix most errors reported by pycodestyle
+  * debian/bin, debian/rules.real: Add symlink to Python package directory
+    instead of editing path
 
  -- Ben Hutchings <ben@decadent.org.uk>  Thu, 20 Sep 2018 02:40:54 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 81b429386476..0ba8309914e7 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -35,7 +35,6 @@ else
 endif
 export CROSS_COMPILE
 
-export PYTHONPATH = $(CURDIR)/debian/lib/python
 export DH_OPTIONS
 export DEB_HOST_ARCH DEB_HOST_GNU_TYPE DEB_BUILD_ARCH
 export DEB_BUILD_PATH = $(CURDIR)  # for dpkg-buildflags