diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-16 16:29:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-16 16:31:01 +0000 |
commit | 4dcd9d6ceed7262657a628546160d0dced13f45d (patch) | |
tree | ced54a539cc9d4408beb9f89b2164aac10f387fc | |
parent | 088642f51b03dd42a69dc1a84ff9235009c22564 (diff) | |
download | poky-4dcd9d6ceed7262657a628546160d0dced13f45d.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.
(From OE-Core rev: 11e2aaf2d751277e3e99ac2acbbeff2b7227be94)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/package_manager.py | 9 |
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): | |||
112 | rpm_dirs_found = True | 112 | rpm_dirs_found = True |
113 | 113 | ||
114 | if not rpm_dirs_found: | 114 | if not rpm_dirs_found: |
115 | return("There are no packages in %s" % self.deploy_dir) | 115 | bb.note("There are no packages in %s" % self.deploy_dir) |
116 | return | ||
116 | 117 | ||
117 | nproc = multiprocessing.cpu_count() | 118 | nproc = multiprocessing.cpu_count() |
118 | pool = bb.utils.multiprocessingpool(nproc) | 119 | pool = bb.utils.multiprocessingpool(nproc) |
@@ -156,7 +157,8 @@ class OpkgIndexer(Indexer): | |||
156 | (opkg_index_cmd, pkgs_file, pkgs_file, pkgs_dir)) | 157 | (opkg_index_cmd, pkgs_file, pkgs_file, pkgs_dir)) |
157 | 158 | ||
158 | if len(index_cmds) == 0: | 159 | if len(index_cmds) == 0: |
159 | return("There are no packages in %s!" % self.deploy_dir) | 160 | bb.note("There are no packages in %s!" % self.deploy_dir) |
161 | return | ||
160 | 162 | ||
161 | nproc = multiprocessing.cpu_count() | 163 | nproc = multiprocessing.cpu_count() |
162 | pool = bb.utils.multiprocessingpool(nproc) | 164 | pool = bb.utils.multiprocessingpool(nproc) |
@@ -197,7 +199,8 @@ class DpkgIndexer(Indexer): | |||
197 | deb_dirs_found = True | 199 | deb_dirs_found = True |
198 | 200 | ||
199 | if not deb_dirs_found: | 201 | if not deb_dirs_found: |
200 | return("There are no packages in %s" % self.deploy_dir) | 202 | bb.note("There are no packages in %s" % self.deploy_dir) |
203 | return | ||
201 | 204 | ||
202 | nproc = multiprocessing.cpu_count() | 205 | nproc = multiprocessing.cpu_count() |
203 | pool = bb.utils.multiprocessingpool(nproc) | 206 | pool = bb.utils.multiprocessingpool(nproc) |