[oe-commits] Paul Eggleton : scripts/oe-pkgdata-util: exclude unpackaged in glob output

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 4a85d8a4026cf1d1603513ed9780f80c603cc611
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4a85d8a4026cf1d1603513ed9780f80c603cc611

Author: Paul Eggleton <paul.eggleton at linux.intel.com>
Date:   Mon Jul 30 09:52:01 2012 +0100

scripts/oe-pkgdata-util: exclude unpackaged in glob output

Check for .packaged file and exclude packages if this file does not
exist - this avoids attempting to install empty packages during
complementary package installation within do_rootfs that didn't end up
being created (and failing as a result).

Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/oe-pkgdata-util |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/scripts/oe-pkgdata-util b/scripts/oe-pkgdata-util
index 2427f10..900c27a 100755
--- a/scripts/oe-pkgdata-util
+++ b/scripts/oe-pkgdata-util
@@ -112,6 +112,8 @@ def glob(args):
                     fwdfile = fwdpkgdata(mappedpkg)
                     if os.path.exists(fwdfile):
                         mappedpkg = readrenamed(fwdfile)
+                    if not os.path.exists(fwdfile + ".packaged"):
+                        mappedpkg = ""
                 else:
                     # That didn't work, so now get the PN, substitute that, then map in the other direction
                     revlink = revpkgdata(pkg)
@@ -121,6 +123,8 @@ def glob(args):
                         fwdfile = fwdpkgdata(newpkg)
                         if os.path.exists(fwdfile):
                             mappedpkg = readrenamed(fwdfile)
+                        if not os.path.exists(fwdfile + ".packaged"):
+                            mappedpkg = ""
                     else:
                         # Package doesn't even exist...
                         if debug: