Erm, the subject should probably have been BBFILES: not BBMASK:. Remnant of a previous commit.
On Mar 23, 2009, at 9:20 AM, Chris Larson wrote: > Signed-off-by: Chris Larson <[email protected]> > --- > lib/bb/cooker.py | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py > index 6833ec2..83644b9 100644 > --- a/lib/bb/cooker.py > +++ b/lib/bb/cooker.py > @@ -691,7 +691,11 @@ class BBCooker: > if dirfiles: > newfiles += dirfiles > continue > - newfiles += glob.glob(f) or [ f ] > + else: > + globbed = glob.glob(f) > + if not globbed and os.path.exists(f): > + globbed = [f] > + newfiles += globbed > > bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) > > @@ -704,9 +708,8 @@ class BBCooker: > bb.msg.fatal(bb.msg.domain.Collection, "BBMASK is not a > valid regular expression.") > > finalfiles = [] > - for i in xrange( len( newfiles ) ): > - f = newfiles[i] > - if bbmask and bbmask_compiled.search(f): > + for f in newfiles: > + if bbmask_compiled.search(f): > bb.msg.debug(1, bb.msg.domain.Collection, "skipping > masked file %s" % f) > masked += 1 > continue > -- > 1.6.0 > -- Chris Larson Software Engineer MontaVista Software, Inc. Work: 480-517-5031 Home: 480-963-2636 Email: clarson AT mvista DOT com Email: clarson AT kergoth DOT com _______________________________________________ Bitbake-dev mailing list [email protected] https://lists.berlios.de/mailman/listinfo/bitbake-dev
