Merge lp:~milo/linaro-image-tools/bug1231266 into lp:linaro-image-tools/11.11

[Milo Casagrande]

Cleanup of some empty spaces that were creating broken boot command lines.

Unmerged revisions

646. By Milo Casagrande on 2013-10-04

Removed empty spaces or new lines at string end.

=== modified file 'linaro_image_tools/media_create/android_boards.py'
--- linaro_image_tools/media_create/android_boards.py	2013-11-28 09:30:19 +0000
+++ linaro_image_tools/media_create/android_boards.py	2013-12-10 11:13:18 +0000
@@ -183,7 +183,7 @@
         return (
             "%(serial_options)s "
             "%(boot_args_options)s"
-            % replacements)
+            % replacements).strip()
 
     def _get_boot_env(self, consoles):
         """Get the boot environment for this board.
@@ -212,11 +212,12 @@
 
         boot_env = self._get_boot_env(consoles)
         cmdline_filepath = os.path.join(boot_disk, "cmdline")
-        cmdline_file = open(cmdline_filepath, 'r')
-        android_kernel_cmdline = cmdline_file.read()
+
+        with open(cmdline_filepath, 'r') as cmdline_file:
+            android_kernel_cmdline = cmdline_file.read().strip()
+
         boot_env['bootargs'] = boot_env['bootargs'] + ' ' + \
             android_kernel_cmdline
-        cmdline_file.close()
 
         boot_dir = boot_disk
         boot_script_path = os.path.join(boot_dir, self.boot_script)

=== modified file 'linaro_image_tools/media_create/boards.py'
--- linaro_image_tools/media_create/boards.py	2013-09-23 09:55:03 +0000
+++ linaro_image_tools/media_create/boards.py	2013-12-10 11:13:18 +0000
@@ -577,14 +577,14 @@
         boot_args_options = 'rootwait ro'
         serial_options = ''
         if self.extra_boot_args_options:
-            boot_args_options += ' %s' % self.extra_boot_args_options
+            boot_args_options += ' %s' % self.extra_boot_args_options.strip()
         if self.extra_serial_options:
-            serial_options = self.extra_serial_options
+            serial_options = self.extra_serial_options.strip()
         for console in consoles:
-            serial_options += ' console=%s' % console
+            serial_options += ' console=%s' % console.strip()
 
         lowmem_opt = ''
-        boot_snippet = 'root=%s' % rootfs_id
+        boot_snippet = 'root=%s' % rootfs_id.strip()
         if is_live:
             serial_options += ' %s' % self.live_serial_options
             boot_snippet = 'boot=casper'
@@ -1937,7 +1937,7 @@
         'setenv fdt_high "%(fdt_high)s"\n'
         'setenv bootcmd "%(bootcmd)s"\n'
         'setenv bootargs "%(bootargs)s"\n'
-        "boot"
+        'boot'
         % boot_env)