diff options
| author | Roman I Khimov <khimov@altell.ru> | 2009-04-01 00:15:28 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-04-21 22:45:05 +0200 |
| commit | 462a9789b27b105282b99185a26e58f7c523647b (patch) | |
| tree | 539e3aae636f56f0ccf9e70f3a9fea172192f12a | |
| parent | 2c367f622690f191b4ee5f583a9488156a30134f (diff) | |
package.bbclass: fix globbing for mask-like files
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>
| -rw-r--r-- | classes/package.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 7a61c5a0fb..8a77369682 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -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: |