[oe-commits] Ross Burton : license.bbclass: use shutil instead of bb.utils.copyfile
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 4 17:13:58 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: dc81df215cc94c279991df35125d94770a1bc3d2
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=dc81df215cc94c279991df35125d94770a1bc3d2
Author: Ross Burton <ross.burton at intel.com>
Date: Wed Oct 2 16:30:21 2013 +0000
license.bbclass: use shutil instead of bb.utils.copyfile
bb.utils.copyfile is for a specific purpose and more complicated than needed
here, so just use shutil.copyfile.
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/license.bbclass | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 0160313..6abdae4 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -128,12 +128,14 @@ def add_package_and_files(d):
d.setVar('RRECOMMENDS_' + pn, "%s" % (pn_lic))
def copy_license_files(lic_files_paths, destdir):
+ import shutil
+
bb.utils.mkdirhier(destdir)
for (basename, path) in lic_files_paths:
- ret = bb.utils.copyfile(path, os.path.join(destdir, basename))
- # If the copy didn't occur, something horrible went wrong and we fail out
- if not ret:
- bb.warn("%s could not be copied for some reason. It may not exist. WARN for now." % path)
+ try:
+ ret = shutil.copyfile(path, os.path.join(destdir, basename))
+ except Exception as e:
+ bb.warn("Could not copy license file %s: %s" % (basename, e))
def find_license_files(d):
"""
More information about the Openembedded-commits
mailing list