From: Richard Purdie Date: Sun, 16 Feb 2014 16:29:25 +0000 (+0000) Subject: lib/oe/package_manager: Make empty package directories non-fatal X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~34478 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e2aaf2d751277e3e99ac2acbbeff2b7227be94;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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. Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 2faf4224b3f..6dc8fbd9e46 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)