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.
This commit is contained in:
Ben Hutchings 2018-10-01 16:39:31 +01:00
parent af0098b10a
commit 9cfb948048
10 changed files with 3 additions and 8 deletions

View File

@ -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 *

View File

@ -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 *

1
debian/bin/debian_linux vendored Symbolic link
View File

@ -0,0 +1 @@
../lib/python/debian_linux/

View File

@ -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

View File

@ -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

View File

@ -11,7 +11,6 @@ import subprocess
import time
import warnings
sys.path.append("debian/lib/python")
from debian_linux.debian import Changelog, VersionLinux

View File

@ -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])

View File

@ -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

2
debian/changelog vendored
View File

@ -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

1
debian/rules.real vendored
View File

@ -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