[oe-commits] Paul Eggleton : classes/buildhistory: ensure old package info is removed
git at git.openembedded.org
git at git.openembedded.org
Mon Aug 6 14:33:52 UTC 2012
Module: openembedded-core.git
Branch: master
Commit: 223b183197b363edef0c11a25bad33555fca5a15
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=223b183197b363edef0c11a25bad33555fca5a15
Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date: Thu Aug 2 10:23:02 2012 +0100
classes/buildhistory: ensure old package info is removed
If a package is removed from PACKAGES, ensure that the package info file
and directory are removed from buildhistory so that we don't have stale
data lying around.
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/buildhistory.bbclass | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/meta/classes/buildhistory.bbclass b/meta/classes/buildhistory.bbclass
index f5494cd..c3555da 100644
--- a/meta/classes/buildhistory.bbclass
+++ b/meta/classes/buildhistory.bbclass
@@ -149,6 +149,19 @@ python buildhistory_emit_pkghistory() {
pr = d.getVar('PR', True)
packages = squashspaces(d.getVar('PACKAGES', True))
+ packagelist = packages.split()
+ if not os.path.exists(pkghistdir):
+ os.makedirs(pkghistdir)
+ else:
+ # Remove files for packages that no longer exist
+ for item in os.listdir(pkghistdir):
+ if item != "latest":
+ 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)
+
rcpinfo = RecipeInfo(pn)
rcpinfo.pe = pe
rcpinfo.pv = pv
@@ -159,7 +172,7 @@ python buildhistory_emit_pkghistory() {
# Apparently the version can be different on a per-package basis (see Python)
pkgdest = d.getVar('PKGDEST', True)
- for pkg in packages.split():
+ for pkg in packagelist:
pe = getpkgvar(pkg, 'PE') or "0"
pv = getpkgvar(pkg, 'PV')
pr = getpkgvar(pkg, 'PR')
@@ -206,9 +219,6 @@ def write_recipehistory(rcpinfo, d):
pkghistdir = d.getVar('BUILDHISTORY_DIR_PACKAGE', True)
- if not os.path.exists(pkghistdir):
- os.makedirs(pkghistdir)
-
infofile = os.path.join(pkghistdir, "latest")
f = open(infofile, "w")
try:
More information about the Openembedded-commits
mailing list