From 4dcd9d6ceed7262657a628546160d0dced13f45d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sun, 16 Feb 2014 16:29:25 +0000 Subject: lib/oe/package_manager: Make empty package directories non-fatal Its perfectly reasonable to call -c package-index with empty package directories. This ensures the builds don't fail in such cases, resolving autobuilder failures. (From OE-Core rev: 11e2aaf2d751277e3e99ac2acbbeff2b7227be94) Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2faf4224b3..6dc8fbd9e4 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -112,7 +112,8 @@ class RpmIndexer(Indexer): rpm_dirs_found = True if not rpm_dirs_found: - return("There are no packages in %s" % self.deploy_dir) + bb.note("There are no packages in %s" % self.deploy_dir) + return nproc = multiprocessing.cpu_count() pool = bb.utils.multiprocessingpool(nproc) @@ -156,7 +157,8 @@ class OpkgIndexer(Indexer): (opkg_index_cmd, pkgs_file, pkgs_file, pkgs_dir)) if len(index_cmds) == 0: - return("There are no packages in %s!" % self.deploy_dir) + bb.note("There are no packages in %s!" % self.deploy_dir) + return nproc = multiprocessing.cpu_count() pool = bb.utils.multiprocessingpool(nproc) @@ -197,7 +199,8 @@ class DpkgIndexer(Indexer): deb_dirs_found = True if not deb_dirs_found: - return("There are no packages in %s" % self.deploy_dir) + bb.note("There are no packages in %s" % self.deploy_dir) + return nproc = multiprocessing.cpu_count() pool = bb.utils.multiprocessingpool(nproc) -- cgit v1.2.3-54-g00ecf