From d4398d41be6974d57e834cc9737348ba13e10547 Mon Sep 17 00:00:00 2001 From: Stefan Stanacar Date: Thu, 28 Nov 2013 15:27:00 +0200 Subject: lib/oeqa: use the new manifest file for determining if a package is installed Use the new manifest file instead of ${WORKDIR}/installed_pkgs.txt for determining if an image has a certain package, because installed_pkgs.txt goes away with rm_work enabled. We can't use the IMAGE_MANIFEST var for the file path because that relies on IMAGE_NAME which changes at every run (because of date), so we use the link which points to the last one built. [ YOCTO #5072 ] (From OE-Core rev: f57c83fc33583c140f668946f3f3e79b960aa9ee) Signed-off-by: Stefan Stanacar Signed-off-by: Richard Purdie --- meta/lib/oeqa/oetest.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'meta/lib/oeqa/oetest.py') diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index 3bb3589468..95661506e3 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -56,17 +56,11 @@ class oeTest(unittest.TestCase): @classmethod def hasPackage(self, pkg): - - pkgfile = os.path.join(oeTest.tc.d.getVar("WORKDIR", True), "installed_pkgs.txt") - - with open(pkgfile) as f: - data = mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) - match = re.search(pkg, data) - data.close() - - if match: + manifest = os.path.join(oeTest.tc.d.getVar("DEPLOY_DIR_IMAGE", True), oeTest.tc.d.getVar("IMAGE_LINK_NAME", True) + ".manifest") + with open(manifest) as f: + data = f.read() + if re.search(pkg, data): return True - return False @classmethod -- cgit v1.2.3-54-g00ecf