From: Robert Yang <liezhi.yang@windriver.com>
Date: Thu, 19 Mar 2015 05:33:01 +0000 (-0700)
Subject: oelint.bbclass: remove duplicated code
X-Git-Tag: yocto-4.0~26450
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bb3b8e4e7580c1dfdfe584d3b5f0fe6803826a43;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/classes/oelint.bbclass b/meta/classes/oelint.bbclass
index 1cee4b0f25c..3e015037566 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'))
 }