Merge lp:~javier.collado/utah/bug1118581 into lp:utah

[Javier Collado]

This branch fixes the nested quotation problems that happen when using a list
of commands that have their own quotation marks.

[Max Brustkern (nuclearbob)]

This looks elaborate and useful. I'm going to run a test of it.

[Max Brustkern (nuclearbob)]

This looks good. I've also confirmed the truncation running on my system without it.

review: Approve

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2013-02-01 11:40:31 +0000
+++ utah/provisioning/provisioning.py	2013-02-08 17:01:39 +0000
@@ -868,12 +868,18 @@
                           .format(self.CHECK_LOCK_COMMAND, pkg_name, log_file)
                           for pkg_name in config.installpackages]))
             postinstall_commands = (
-                'sed -i -e "/^exit 0$/i{}" /etc/rc.local;'
+                'sed -i -e \'/^exit 0$/i{}\' /etc/rc.local;'
                 .format(install_commands)
             )
             chroot_command = ' '.join([install_commands, postinstall_commands])
-            question.value.prepend('in-target sh -c \'{}\'; '
-                                   .format(chroot_command))
+            # Note that since the chroot command is passed to sh within single
+            # quotes, the single quotes inside the chroot command have to be
+            # escaped using '"'"'
+            # For more information, please refer to:
+            # http://stackoverflow.com/q/1250079/183066
+            question.value.prepend(
+                'in-target sh -c \'{}\'; '
+                .format(chroot_command.replace('\'', '\'"\'"\'')))
             question.prepend("ubiquity ubiquity/summary note")
             question.prepend("ubiquity ubiquity/reboot boolean true")
         else: