diff options
author | Chris Larson <clarson@mvista.com> | 2009-12-06 19:52:52 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-03-25 17:26:02 +0000 |
commit | 19d5f2b067bdfdf7caa87b67ffae5d81e4ecdf29 (patch) | |
tree | 46a956eb8778a12c86efac84caccbbd0549d344c | |
parent | adbfce3958ad954fa70967fe368de87d9f75cd93 (diff) | |
download | poky-19d5f2b067bdfdf7caa87b67ffae5d81e4ecdf29.tar.gz |
BBFILES: use a set to remove duplicates when collecting.
(Bitbake rev: b1b06133da4ca379a60775552d481f7fbf77e999)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | bitbake/lib/bb/cooker.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index be73c8a271..5dd8a95759 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -852,23 +852,23 @@ class BBCooker: | |||
852 | bb.msg.error(bb.msg.domain.Collection, "no recipe files to build, check your BBPATH and BBFILES?") | 852 | bb.msg.error(bb.msg.domain.Collection, "no recipe files to build, check your BBPATH and BBFILES?") |
853 | bb.event.fire(CookerExit(), self.configuration.event_data) | 853 | bb.event.fire(CookerExit(), self.configuration.event_data) |
854 | 854 | ||
855 | newfiles = [] | 855 | newfiles = set() |
856 | for f in files: | 856 | for f in files: |
857 | if os.path.isdir(f): | 857 | if os.path.isdir(f): |
858 | dirfiles = self.find_bbfiles(f) | 858 | dirfiles = self.find_bbfiles(f) |
859 | if dirfiles: | 859 | if dirfiles: |
860 | newfiles += dirfiles | 860 | newfiles.update(dirfiles) |
861 | continue | 861 | continue |
862 | else: | 862 | else: |
863 | globbed = glob.glob(f) | 863 | globbed = glob.glob(f) |
864 | if not globbed and os.path.exists(f): | 864 | if not globbed and os.path.exists(f): |
865 | globbed = [f] | 865 | globbed = [f] |
866 | newfiles += globbed | 866 | newfiles.update(globbed) |
867 | 867 | ||
868 | bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) | 868 | bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) |
869 | 869 | ||
870 | if not bbmask: | 870 | if not bbmask: |
871 | return (newfiles, 0) | 871 | return (list(newfiles), 0) |
872 | 872 | ||
873 | try: | 873 | try: |
874 | bbmask_compiled = re.compile(bbmask) | 874 | bbmask_compiled = re.compile(bbmask) |