Merge lp:~salgado/linaro-image-tools/bug-697238 into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Use a temp file rather than stdout to pass data from a python script to l-m-c

[James Westby (james-w)]

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2011-01-04 12:08:13 +0000
+++ linaro-media-create	2011-01-04 14:31:19 +0000
@@ -394,11 +394,13 @@
 }
 
 setup_partitions() {
-  boot_and_root_devices=$(python -m media_create.partitions \
+  python -m media_create.partitions ${TMP_DIR}/boot_and_root_devices \
       "$DEVIMAGE" "${DEVICE-$IMAGE_FILE}" "$FAT_SIZE" "$IMAGE_SIZE" \
       "$BOOT_LABEL" "$RFS_LABEL" "$RFS" "$RFS_UUID" \
-      "$SHOULD_CREATE_PARTITIONS" "$BOOTFS_STEP" "$ROOTFS_STEP")
-  eval $boot_and_root_devices
+      "$SHOULD_CREATE_PARTITIONS" "$BOOTFS_STEP" "$ROOTFS_STEP"
+  # The above call will write the BOOTFS and ROOTFS shell variables to the
+  # file given as the first argument so here we just need to source it.
+  . ${TMP_DIR}/boot_and_root_devices
 
   if [ "${IMAGE_FILE}" ]; then
     register_loopback "$BOOTFS"

=== modified file 'media_create/partitions.py'
--- media_create/partitions.py	2010-12-17 12:42:47 +0000
+++ media_create/partitions.py	2011-01-04 14:31:19 +0000
@@ -269,7 +269,8 @@
 if __name__ == "__main__":
     (board, device, fat_size, image_size, bootfs_label, rootfs_label,
         rootfs_type, rootfs_uuid, should_create_partitions, bootfs_step,
-        rootfs_step) = sys.argv[1:]
+        rootfs_step) = sys.argv[2:]
+    out_file = sys.argv[1]
     fat_size = int(fat_size)
     should_format_bootfs = True
     should_format_rootfs = True
@@ -281,4 +282,7 @@
         board, Media(device), fat_size, image_size, bootfs_label,
         rootfs_label, rootfs_type, rootfs_uuid, should_create_partitions,
         should_format_bootfs, should_format_rootfs)
-    print "BOOTFS=%s ROOTFS=%s" % (boot, root)
+    # Write the boot/root partitions to the given out file to be later sourced
+    # in the shell script.
+    with open(out_file, 'w') as fd:
+        fd.write("BOOTFS=%s ROOTFS=%s\n" % (boot, root))

=== modified file 'tests/integration.txt'
--- tests/integration.txt	2010-12-17 12:42:47 +0000
+++ tests/integration.txt	2011-01-04 14:31:19 +0000
@@ -11,18 +11,20 @@
 
     # Partition (for real!) /dev/sdb for a beagle board and return the devices
     # for the boot and root partitions.
-    >>> python -m media_create.partitions beagle /dev/sdb 32 2G boot root ext3
-    ...     2e82008e-1af3-4699-8521-3bf5bac1e67a yes format-bootfs format-rootfs
+    >>> python -m media_create.partitions /tmp/out_file beagle /dev/sdb 32 2G
+    ...     boot root ext3 2e82008e-1af3-4699-8521-3bf5bac1e67a yes
+    ...     format-bootfs format-rootfs
     Checking that no-one is using this disk right now
     ...
+    >>> cat /tmp/out_file
     BOOTFS=/dev/sdb1 ROOTFS=/dev/sdb2
 
     # Partition /tmp/beagle.img for a beagle board and return the loopback
     # devices for the boot and root partitions.
-    >>> python -m media_create.partitions beagle /tmp/beagle.img 32 2G boot
-    ...     root ext3 2e82008e-1af3-4699-8521-3bf5bac1e67a yes
+    >>> python -m media_create.partitions /tmp/out_file beagle /tmp/beagle.img
+    ...     32 2G boot root ext3 2e82008e-1af3-4699-8521-3bf5bac1e67a yes
     ...     format-bootfs format-rootfs
     Warning: /tmp/beagle.img is not a block device
     ...
-    BOOTFS=/dev/loop0
-    ROOTFS=/dev/loop1
+    >>> cat /tmp/out_file
+    BOOTFS=/dev/loop0 ROOTFS=/dev/loop1