mirror of
https://git.yoctoproject.org/poky
synced 2026-09-20 03:49:32 +02:00
oelint.bbclass: remove duplicated code
The old code 'if not srcpath.find("{PN}") == -1:' looks strange, use
'if srcpath.find("{PN}") != -1:' and remove duplicated code.
(From OE-Core rev: bb3b8e4e7580c1dfdfe584d3b5f0fe6803826a43)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7366894e41
commit
5dc1f3d8a0
@@ -54,6 +54,12 @@ python do_lint() {
|
|||||||
f.close()
|
f.close()
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
def checkPN(pkgname, varname, str):
|
||||||
|
if str.find("{PN}") != -1:
|
||||||
|
bb.warn("%s: should use BPN instead of PN in %s" % (pkgname, varname))
|
||||||
|
if str.find("{P}") != -1:
|
||||||
|
bb.warn("%s: should use BP instead of P in %s" % (pkgname, varname))
|
||||||
|
|
||||||
length = len("file://")
|
length = len("file://")
|
||||||
for item in srcuri:
|
for item in srcuri:
|
||||||
if item.startswith("file://"):
|
if item.startswith("file://"):
|
||||||
@@ -72,14 +78,7 @@ python do_lint() {
|
|||||||
#
|
#
|
||||||
for s in srcuri:
|
for s in srcuri:
|
||||||
if not s.startswith("file://"):
|
if not s.startswith("file://"):
|
||||||
if not s.find("{PN}") == -1:
|
checkPN(pkgname, 'SRC_URI', s)
|
||||||
bb.warn("%s: should use BPN instead of PN in SRC_URI" % pkgname)
|
|
||||||
if not s.find("{P}") == -1:
|
|
||||||
bb.warn("%s: should use BP instead of P in SRC_URI" % pkgname)
|
|
||||||
|
|
||||||
srcpath = d.getVar("S")
|
checkPN(pkgname, 'S', d.getVar('S'))
|
||||||
if not srcpath.find("{PN}") == -1:
|
|
||||||
bb.warn("%s: should use BPN instead of PN in S" % pkgname)
|
|
||||||
if not srcpath.find("{P}") == -1:
|
|
||||||
bb.warn("%s: should use BP instead of P in S" % pkgname)
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user