Merge lp:~salgado/linaro-image-tools/remove-extra-get-devs-by-id-call into lp:linaro-image-tools/11.11

[Guilherme Salgado]

Remove an unnecessary call to get_device_by_id and fix some indentation

[Peter Maydell (pmaydell)]

I would prefer not to mix whitespace cleanup and semantic changes in the same commit...

[lp:~salgado/linaro-image-tools/remove-extra-get-devs-by-id-call]

167. By Guilherme Salgado on 2010-11-12

Properly indent code. I wish we had some form of watchdog to at least prevent <tab>s in the code

168. By Guilherme Salgado on 2010-11-12

Remove an unnecessary call to get_device_by_id and fix some indentation

[Guilherme Salgado (salgado)]

On Fri, 2010-11-12 at 17:14 +0000, Peter Maydell wrote:
> I would prefer not to mix whitespace cleanup and semantic changes in the same commit...

And I would prefer that I didn't have to fix indentation and replace
<tab>s with spaces. ;)

In general I don't mix cleanup with semantic changes, but in this case
the semantic change is a one-liner, so I didn't bother. Anyway, I've
split that into a couple commits (r167 and r168) so they can be reviewed
(or reverted, if needed) independently.

[James Westby (james-w)]

review: Approve

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-11-09 20:48:16 +0000
+++ linaro-media-create	2010-11-12 17:24:20 +0000
@@ -451,7 +451,7 @@
 
     for d in $loop_devices; do
       if [ -n "$d" ]; then
-	sudo losetup -d "$d"
+        sudo losetup -d "$d"
       fi
     done
 
@@ -517,35 +517,37 @@
 
 prepare_partitions() {
 
-echo -n "waiting for partitioning to settle ..."
-sync
-sleep 3
-echo "done."
-get_device_by_id
-
-if [ "$BOOTFS_STEP" ]; then
-  echo ""
-  echo "Formating Boot Partition"
-  echo ""
-  if [ -z "$BOOTFS" ]; then
-    echo "Partition $BOOTFS does not exist"
-    exit 2
-  else
-    sudo mkfs.vfat -F ${FAT_SIZE} ${BOOTFS} -n ${BOOT_LABEL}
-  fi
-fi
-
-if [ "$ROOTFS_STEP" ]; then
-  echo ""
-  echo "Formating ${RFS} Partition"
-  echo ""
-  if [ -z "$ROOTFS" ]; then
-    echo "Partition $ROOTFS does not exist"
-    exit 2
-  else
-    sudo mkfs.${RFS} -U "$RFS_UUID" ${ROOTFS} -L ${RFS_LABEL}
-  fi
-fi
+  # sync and sleep a bit as the partitions may have been created in the
+  # previous step.
+  echo -n "waiting for partitioning to settle ..."
+  sync
+  sleep 3
+  echo "done."
+  get_device_by_id
+
+  if [ "$BOOTFS_STEP" ]; then
+    echo ""
+    echo "Formating Boot Partition"
+    echo ""
+    if [ -z "$BOOTFS" ]; then
+      echo "Partition $BOOTFS does not exist"
+      exit 2
+    else
+      sudo mkfs.vfat -F ${FAT_SIZE} ${BOOTFS} -n ${BOOT_LABEL}
+    fi
+  fi
+
+  if [ "$ROOTFS_STEP" ]; then
+    echo ""
+    echo "Formating ${RFS} Partition"
+    echo ""
+    if [ -z "$ROOTFS" ]; then
+      echo "Partition $ROOTFS does not exist"
+      exit 2
+    else
+      sudo mkfs.${RFS} -U "$RFS_UUID" ${ROOTFS} -L ${RFS_LABEL}
+    fi
+  fi
 }
 
 populate_boot() {
@@ -907,7 +909,6 @@
 else
   echo "Warning, --hwpack <filename> was not specified, the result is unlikely to be functional without manual effort to setup uImage, MLO, u-boot.bin and so as as appropriate for your hardware."
 fi
-get_device_by_id
 for func in $DEPLOY_STEPS; do
   $func
 done