summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-03-18 22:33:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-22 14:42:15 +0000
commit5dc1f3d8a0b7394398f9a090890e6af41a5e39dc (patch)
treed62310fa6aea7e92855e497465428b52954d89e4
parent7366894e41139ed9e5d6c70c5f0ba4c52a2dc239 (diff)
downloadast2050-yocto-poky-5dc1f3d8a0b7394398f9a090890e6af41a5e39dc.zip
ast2050-yocto-poky-5dc1f3d8a0b7394398f9a090890e6af41a5e39dc.tar.gz
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>
-rw-r--r--meta/classes/oelint.bbclass17
1 files changed, 8 insertions, 9 deletions
diff --git a/meta/classes/oelint.bbclass b/meta/classes/oelint.bbclass
index 1cee4b0..3e01503 100644
--- a/meta/classes/oelint.bbclass
+++ b/meta/classes/oelint.bbclass
@@ -54,6 +54,12 @@ python do_lint() {
f.close()
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://")
for item in srcuri:
if item.startswith("file://"):
@@ -72,14 +78,7 @@ python do_lint() {
#
for s in srcuri:
if not s.startswith("file://"):
- if not s.find("{PN}") == -1:
- 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)
+ checkPN(pkgname, 'SRC_URI', s)
- srcpath = 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)
+ checkPN(pkgname, 'S', d.getVar('S'))
}
OpenPOWER on IntegriCloud