aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-16 16:29:25 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-16 16:30:58 +0000
commit11e2aaf2d751277e3e99ac2acbbeff2b7227be94 (patch)
tree4a8727db5352e6896b1a008632fe6f5abe0f85b7
parente927e838cf2b4d6c2a55421f2db957dcfb186b8a (diff)
downloadopenembedded-core-contrib-11e2aaf2d751277e3e99ac2acbbeff2b7227be94.tar.gz
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 <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py9
1 files changed, 6 insertions, 3 deletions
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)