1842bb1470
One of the possible usages of check-package is to first cd to the directory that contains the files to test (e.g. a package directory) and then call the script passing the files in the current dir. It already works when used for intree files, but for files in a br2-external it throws an exception because some check functions (from utils/checkpackagelib/lib_*.py) do need the name of the file being processed and assume there will be a slash before the name. Fix all check functions that assume that the full filename being checked contains a slash. Do not use regexps to extract the filename, use os.path functions instead. Notice RemoveDefaultPackageSourceVariable and TypoInPackageVariable lead to an exception in this case, but ApplyOrder instead generates a false warning. Fixes bug #11271. Reported-by: Vitaliy Lotorev <lotorev@gmail.com> Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Vitaliy Lotorev <lotorev@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
63 lines
1.9 KiB
Python
63 lines
1.9 KiB
Python
# See utils/checkpackagelib/readme.txt before editing this file.
|
|
# The format of the patch files is tested during the build, so below check
|
|
# functions don't need to check for things already checked by running
|
|
# "make package-dirclean package-patch".
|
|
|
|
import os
|
|
import re
|
|
|
|
from checkpackagelib.base import _CheckFunction
|
|
from checkpackagelib.lib import NewlineAtEof # noqa: F401
|
|
|
|
|
|
class ApplyOrder(_CheckFunction):
|
|
APPLY_ORDER = re.compile("\d{1,4}-[^/]*$")
|
|
|
|
def before(self):
|
|
if not self.APPLY_ORDER.match(os.path.basename(self.filename)):
|
|
return ["{}:0: use name <number>-<description>.patch "
|
|
"({}#_providing_patches)"
|
|
.format(self.filename, self.url_to_manual)]
|
|
|
|
|
|
class NumberedSubject(_CheckFunction):
|
|
NUMBERED_PATCH = re.compile("Subject:\s*\[PATCH\s*\d+/\d+\]")
|
|
|
|
def before(self):
|
|
self.git_patch = False
|
|
self.lineno = 0
|
|
self.text = None
|
|
|
|
def check_line(self, lineno, text):
|
|
if text.startswith("diff --git"):
|
|
self.git_patch = True
|
|
return
|
|
if self.NUMBERED_PATCH.search(text):
|
|
self.lineno = lineno
|
|
self.text = text
|
|
|
|
def after(self):
|
|
if self.git_patch and self.text:
|
|
return ["{}:{}: generate your patches with 'git format-patch -N'"
|
|
.format(self.filename, self.lineno),
|
|
self.text]
|
|
|
|
|
|
class Sob(_CheckFunction):
|
|
SOB_ENTRY = re.compile("^Signed-off-by: .*$")
|
|
|
|
def before(self):
|
|
self.found = False
|
|
|
|
def check_line(self, lineno, text):
|
|
if self.found:
|
|
return
|
|
if self.SOB_ENTRY.search(text):
|
|
self.found = True
|
|
|
|
def after(self):
|
|
if not self.found:
|
|
return ["{}:0: missing Signed-off-by in the header "
|
|
"({}#_format_and_licensing_of_the_package_patches)"
|
|
.format(self.filename, self.url_to_manual)]
|