From 0a4d1665fded0e571a95227ec3d4620d8486b767 Mon Sep 17 00:00:00 2001 From: David James Date: Wed, 27 Oct 2010 11:39:11 -0700 Subject: [PATCH] Strip newlines from each line in make.conf. This prevents us from having double newlines. Change-Id: I9e9f9e9164872419bf263b15d2a7d048e98a0098 BUG=chromium-os:4843 TEST=Ran unit tests. Review URL: http://codereview.chromium.org/4179002 --- prebuilt.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/prebuilt.py b/prebuilt.py index 1d5acacd46..904ee74a84 100755 --- a/prebuilt.py +++ b/prebuilt.py @@ -89,8 +89,11 @@ def UpdateLocalFile(filename, value, key='PORTAGE_BINHOST'): file_lines = [] found = False for line in file_fh: + # Strip newlines from end of line. We already add newlines below. + line = line.rstrip("\n") + if '=' not in line: - # Skip any line without an equal in it and just write it out + # Skip any line without an equal in it and just write it out. file_lines.append(line) continue