summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-26 11:40:12 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-27 09:42:06 +0000
commitda097095c6f1bd1785ed770b45be45e458b97d8e (patch)
tree4241062026dda8c59c59a357105de40fdef7e1b6
parent9006f9b7063992bdfe934a49715d6bf3504b6774 (diff)
downloadpoky-da097095c6f1bd1785ed770b45be45e458b97d8e.tar.gz
package_manager: Ensure we don't process directories twice
Processing directories twice is both pointless and introduces a race condition. When building the list, ensure duplicates (like "all" and "noarch") are handled correctly. (From OE-Core rev: 4c487543422ae471a01a573bab44e3f6a6d2497a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 0cdf3b0857..692528db16 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -178,7 +178,9 @@ class DpkgIndexer(Indexer):
178 arch_list = pkg_archs.split() 178 arch_list = pkg_archs.split()
179 sdk_pkg_archs = self.d.getVar('SDK_PACKAGE_ARCHS', True) 179 sdk_pkg_archs = self.d.getVar('SDK_PACKAGE_ARCHS', True)
180 if sdk_pkg_archs is not None: 180 if sdk_pkg_archs is not None:
181 arch_list += sdk_pkg_archs.split() 181 for a in sdk_pkg_archs.split():
182 if a not in pkg_archs:
183 arch_list.append(a)
182 184
183 apt_ftparchive = bb.utils.which(os.getenv('PATH'), "apt-ftparchive") 185 apt_ftparchive = bb.utils.which(os.getenv('PATH'), "apt-ftparchive")
184 gzip = bb.utils.which(os.getenv('PATH'), "gzip") 186 gzip = bb.utils.which(os.getenv('PATH'), "gzip")