From dc81df215cc94c279991df35125d94770a1bc3d2 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Wed, 2 Oct 2013 16:30:21 +0000 Subject: 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/license.bbclass | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/classes/license.bbclass') diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 0160313e2e..6abdae4e84 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): """ -- cgit v1.2.3