aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-06 11:24:44 +1200
committerPaul Eggleton <paul.eggleton@linux.intel.com>2016-09-08 08:48:51 +1200
commit98da4211ed1f1379e84b783eb2f3b535c4bb2f34 (patch)
treeaeb68394ea9c21bb7c5c24746aabcb28d9dead67
parent54ce2a7cf5d69509c670268e36efe374f6131c47 (diff)
downloadopenembedded-core-contrib-paule/devtool20-oe.tar.gz
openembedded-core-contrib-paule/devtool20-oe.tar.bz2
openembedded-core-contrib-paule/devtool20-oe.zip
recipetool: create: avoid extra blank lines in output recipepaule/devtool20-oe
If we output extra blank lines (because of some automated editing) then it makes the output recipe look a bit untidy. You could argue that we should simply have the editing code not do that, but sometimes we don't have enough context there for that to be practical. It's simple enough to just filter out the extra blank lines when writing the file, so just do it that way. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--scripts/lib/recipetool/create.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 6ed4ad0ff7..cd86747821 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -714,7 +714,13 @@ def create_recipe(args):
sys.stdout.write('\n'.join(outlines) + '\n')
else:
with open(outfile, 'w') as f:
- f.write('\n'.join(outlines) + '\n')
+ lastline = None
+ for line in outlines:
+ if not lastline and not line:
+ # Skip extra blank lines
+ continue
+ f.write('%s\n' % line)
+ lastline = line
logger.info('Recipe %s has been created; further editing may be required to make it fully functional' % outfile)
if tempsrc: