summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/cooker.py
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r--bitbake/lib/bb/cooker.py19
1 files changed, 11 insertions, 8 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 9f8c71ff13..610824ab21 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -281,13 +281,13 @@ class BBCooker:
281 print >> depends_file, '"%s" -> "%s"' % (pn, depend) 281 print >> depends_file, '"%s" -> "%s"' % (pn, depend)
282 rdepends = self.status.rundeps[fn] 282 rdepends = self.status.rundeps[fn]
283 for package in rdepends: 283 for package in rdepends:
284 for rdepend in rdepends[package]: 284 for rdepend in re.findall("([\w.-]+)(\ \(.+\))?", rdepends[package]):
285 print >> depends_file, '"%s" -> "%s" [style=dashed]' % (package, rdepend) 285 print >> depends_file, '"%s" -> "%s%s" [style=dashed]' % (package, rdepend[0], rdepend[1])
286 packages.append(package) 286 packages.append(package)
287 rrecs = self.status.runrecs[fn] 287 rrecs = self.status.runrecs[fn]
288 for package in rrecs: 288 for package in rrecs:
289 for rdepend in rrecs[package]: 289 for rdepend in re.findall("([\w.-]+)(\ \(.+\))?", rrecs[package]):
290 print >> depends_file, '"%s" -> "%s" [style=dashed]' % (package, rdepend) 290 print >> depends_file, '"%s" -> "%s%s" [style=dashed]' % (package, rdepend[0], rdepend[1])
291 if not package in packages: 291 if not package in packages:
292 packages.append(package) 292 packages.append(package)
293 for package in packages: 293 for package in packages:
@@ -688,7 +688,11 @@ class BBCooker:
688 if dirfiles: 688 if dirfiles:
689 newfiles += dirfiles 689 newfiles += dirfiles
690 continue 690 continue
691 newfiles += glob.glob(f) or [ f ] 691 else:
692 globbed = glob.glob(f)
693 if not globbed and os.path.exists(f):
694 globbed = [f]
695 newfiles += globbed
692 696
693 bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) 697 bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1)
694 698
@@ -701,9 +705,8 @@ class BBCooker:
701 bb.msg.fatal(bb.msg.domain.Collection, "BBMASK is not a valid regular expression.") 705 bb.msg.fatal(bb.msg.domain.Collection, "BBMASK is not a valid regular expression.")
702 706
703 finalfiles = [] 707 finalfiles = []
704 for i in xrange( len( newfiles ) ): 708 for f in newfiles:
705 f = newfiles[i] 709 if bbmask_compiled.search(f):
706 if bbmask and bbmask_compiled.search(f):
707 bb.msg.debug(1, bb.msg.domain.Collection, "skipping masked file %s" % f) 710 bb.msg.debug(1, bb.msg.domain.Collection, "skipping masked file %s" % f)
708 masked += 1 711 masked += 1
709 continue 712 continue