[oe-commits] Richard Purdie : package_manager: Ensure we don' t process directories twice

[git at git.openembedded.org]

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

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Wed Mar 26 11:40:12 2014 +0000

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.

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/lib/oe/package_manager.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 0cdf3b0..692528d 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -178,7 +178,9 @@ class DpkgIndexer(Indexer):
             arch_list = pkg_archs.split()
         sdk_pkg_archs = self.d.getVar('SDK_PACKAGE_ARCHS', True)
         if sdk_pkg_archs is not None:
-            arch_list += sdk_pkg_archs.split()
+            for a in sdk_pkg_archs.split():
+                if a not in pkg_archs:
+                    arch_list.append(a)
 
         apt_ftparchive = bb.utils.which(os.getenv('PATH'), "apt-ftparchive")
         gzip = bb.utils.which(os.getenv('PATH'), "gzip")