[oe-commits] Robert Yang : oelint.bbclass: remove duplicated code
git at git.openembedded.org
git at git.openembedded.org
Sun Mar 22 14:43:06 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: bb3b8e4e7580c1dfdfe584d3b5f0fe6803826a43
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bb3b8e4e7580c1dfdfe584d3b5f0fe6803826a43
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Wed Mar 18 22:33:01 2015 -0700
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.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/oelint.bbclass | 17 ++++++++---------
1 file 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'))
}
More information about the Openembedded-commits
mailing list