[oe-commits] Richard Purdie : lib/oe/package_manager: Make empty package directories non-fatal

[git at git.openembedded.org]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Sun Feb 16 16:29:25 2014 +0000

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 at linuxfoundation.org>

---

 meta/lib/oe/package_manager.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 2faf422..6dc8fbd 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)