summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei@gherzan.ro>2012-04-03 14:05:48 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-04 17:17:51 +0100
commit1dc560c9d21081bcb73ff1eac0070ea58b4880cd (patch)
tree852c2373a659bc8863306cec6eee84eb5ebe7ee5
parentfedad51cb4e141fd9157813ff30e0521cf994f95 (diff)
downloadpoky-1dc560c9d21081bcb73ff1eac0070ea58b4880cd.tar.gz
license.bbclass: Check if copyfile succeeded with isfile
A cleaner way to check if copyfile suceeded is to use os.path.isfile. In this way we can omit warns in some python versions where copyfile return the same non-0 value even is this action is successfull. (From OE-Core rev: fa51fe19a1dc1ddc4c9ec879a782953fd6a15117) Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/license.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index c85233c7a6..6c4a6739f2 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -215,9 +215,10 @@ python do_populate_lic() {
215 if spdx_generic and license_source: 215 if spdx_generic and license_source:
216 # we really should copy to generic_ + spdx_generic, however, that ends up messing the manifest 216 # we really should copy to generic_ + spdx_generic, however, that ends up messing the manifest
217 # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes) 217 # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes)
218 ret = bb.copyfile(os.path.join(license_source, spdx_generic), os.path.join(os.path.join(d.getVar('LICSSTATEDIR', True), pn), "generic_" + license_type)) 218
219 bb.copyfile(os.path.join(license_source, spdx_generic), os.path.join(os.path.join(d.getVar('LICSSTATEDIR', True), pn), "generic_" + license_type))
220 if not os.path.isfile(os.path.join(os.path.join(d.getVar('LICSSTATEDIR', True), pn), "generic_" + license_type)):
219 # If the copy didn't occur, something horrible went wrong and we fail out 221 # If the copy didn't occur, something horrible went wrong and we fail out
220 if not ret:
221 bb.warn("%s for %s could not be copied for some reason. It may not exist. WARN for now." % (spdx_generic, pn)) 222 bb.warn("%s for %s could not be copied for some reason. It may not exist. WARN for now." % (spdx_generic, pn))
222 else: 223 else:
223 # And here is where we warn people that their licenses are lousy 224 # And here is where we warn people that their licenses are lousy