Strip newlines from each line in make.conf.

prebuilt.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import datetime
 import multiprocessing
 import optparse
 import os
 import re
@@ skipping 71 matching lines @@
 
   Args:
     filename: Name of file to modify.
     value: Value to write with the key.
     key: The variable key to update. (Default: PORTAGE_BINHOST)
   """
   file_fh = open(filename)
   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
 
     file_var, file_val = line.split('=')
     keyval_str = '%(key)s=%(value)s'
     if file_var == key:
       found = True
       print 'Updating %s=%s to %s="%s"' % (file_var, file_val, key, value)
       value = '"%s"' % value
       file_lines.append(keyval_str % {'key': key, 'value': value})
@@ skipping 379 matching lines @@
                    options.binhost_base_url, git_sync=options.git_sync)
 
   if options.board:
     UploadPrebuilt(options.build_path, options.upload, version,
                    options.binhost_base_url, board=options.board,
                    git_sync=options.git_sync)
 
 
 if __name__ == '__main__':
   main()