From: Paul Eggleton Date: Fri, 21 Aug 2015 12:55:00 +0000 (+0100) Subject: classes/buildhistory: handle additional files at recipe level X-Git-Tag: 2015-10~691 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b018a046a578e41b105cf72b9fdeed0220ae3046;p=openembedded-core.git classes/buildhistory: handle additional files at recipe level Avoid an error when attempting to remove previous data if it's not a subdirectory - we were assuming that anything that wasn't named "latest" or "latest_srcrev" had to be a directory. This makes it possible to have a buildhistory_emit_pkghistory_append which writes additional files at the recipe level. Signed-off-by: Paul Eggleton Signed-off-by: Ross Burton --- diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index 190c38e114..57dc1e9336 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -172,10 +172,13 @@ python buildhistory_emit_pkghistory() { for item in os.listdir(pkghistdir): if item != "latest" and item != "latest_srcrev": if item not in packagelist: - subdir = os.path.join(pkghistdir, item) - for subfile in os.listdir(subdir): - os.unlink(os.path.join(subdir, subfile)) - os.rmdir(subdir) + itempath = os.path.join(pkghistdir, item) + if os.path.isdir(itempath): + for subfile in os.listdir(itempath): + os.unlink(os.path.join(itempath, subfile)) + os.rmdir(itempath) + else: + os.unlink(itempath) rcpinfo = RecipeInfo(pn) rcpinfo.pe = pe