# HG changeset patch # User yiluzhu # Date 1260545036 0 # Node ID 14d284e7571906b7f1dca96933ce8b975788daf6 # Parent 0e5978b000d1d728c7e331cf799452a172cd8c59 Release: filter terminal flags up when recipe truncated diff -r 0e5978b000d1 -r 14d284e75719 sbsv2/raptor/RELEASE-NOTES.txt --- a/sbsv2/raptor/RELEASE-NOTES.txt Thu Dec 10 16:35:03 2009 +0000 +++ b/sbsv2/raptor/RELEASE-NOTES.txt Fri Dec 11 15:23:56 2009 +0000 @@ -1,6 +1,12 @@ Release Notes for Symbian Build System v2 +version 2.x.x + +Defect Fixes: +Fix for: filter terminal flags up when recipe truncated + + version 2.11.2 Defect Fixes: diff -r 0e5978b000d1 -r 14d284e75719 sbsv2/raptor/python/plugins/filter_terminal.py --- a/sbsv2/raptor/python/plugins/filter_terminal.py Thu Dec 10 16:35:03 2009 +0000 +++ b/sbsv2/raptor/python/plugins/filter_terminal.py Fri Dec 11 15:23:56 2009 +0000 @@ -105,7 +105,7 @@ attribute_re = re.compile("([a-z][a-z0-9]*)='([^']*)'",re.I) maxdots = 40 # if one prints dots then don't print masses - recipelinelimit = 100 # don't scan ultra-long recipes in case we run out of memory + recipelinelimit = 1024 # don't scan ultra-long recipes in case we run out of memory # recipes that we think most users are interested in # and the mapping that we will use to output them as @@ -337,10 +337,11 @@ elif text.startswith("]]>"): if self.inRecipe: self.inBody = False - if self.recipelineExceeded: - self.recipeBody.append("[filter_terminal: OUTPUT TRUNCATED: Recipe output limit exceeded; " + \ - "see logfile for full output (%s lines shown out of %s)]" % \ - (FilterTerminal.recipelinelimit, FilterTerminal.recipelinelimit + self.recipelineExceeded)) + if self.recipelineExceeded > 0: + self.recipeBody.append("[filter_terminal: OUTPUT TRUNCATED: " + \ + "Recipe output limit exceeded; see logfile for full output " + \ + "(%s lines shown out of %s)]" % (FilterTerminal.recipelinelimit, \ + FilterTerminal.recipelinelimit + self.recipelineExceeded)) elif text.startswith("Copied"): if not self.analyseonly and not self.quiet: start = text.find(" to ") + 4