]> git.openpandora.org Git - openembedded.git/commitdiff
package.bbclass: fix globbing for mask-like files
authorRoman I Khimov <khimov@altell.ru>
Wed, 1 Apr 2009 00:15:28 +0000 (00:15 +0000)
committerKoen Kooi <koen@openembedded.org>
Tue, 21 Apr 2009 20:45:05 +0000 (22:45 +0200)
When a package contains two files like "name*" and "name*smth" OE can't
properly package those, looping infinetely trying to build file list. The
reason is that first file name globs to two files and OE adds them both
into the list, then globs the first one again and gets two same files, etc.

Fix that.

Signed-off-by: Koen Kooi <koen@openembedded.org>
classes/package.bbclass

index 7a61c5a0fbd0b471f4a5f475574545b2e2a971fb..8a773696827f2d8e9ec79d6145b07328d0e70443 100644 (file)
@@ -384,8 +384,12 @@ python populate_packages () {
                        globbed = glob.glob(file)
                        if globbed:
                                if [ file ] != globbed:
-                                       files += globbed
-                                       continue
+                                       if not file in globbed:
+                                               files += globbed
+                                               continue
+                                       else:
+                                               globbed.remove(file)
+                                               files += globbed
                        if (not os.path.islink(file)) and (not os.path.exists(file)):
                                continue
                        if file in seen: