Merge lp:~james-w/linaro-image-tools/fix-device-quoting into lp:linaro-image-tools/11.11

[James Westby]

Hi,

Here's a patch from Matt Domsch by email to fix an instance of improper
quoting that prevent him from using the tool.

Thanks,

James

[lp:~james-w/linaro-image-tools/fix-device-quoting]

58. By James Westby on 2010-09-07

Merge trunk.

[Loïc Minier (lool)]

Hey

Sorry, I have already committed that patch in trunk

Thanks,

review: Disapprove

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-07 08:56:14 +0000
+++ debian/changelog	2010-09-07 21:52:42 +0000
@@ -13,6 +13,10 @@
     uuidgen-runtime and do not depend on util-linux, e2fsprogs and coreutils
     as these are Essential: yes; thanks Colin Watson.
 
+  [ Matt Domsch ]
+  * Fix an instance of underquoting which caused problems on systems
+    with odd filenames in /dev/disk/by-id/.
+
  -- Loïc Minier <[e-mail]>  Sun, 05 Sep 2010 10:26:20 +0200
 
 linaro-image-tools (0.1) maverick; urgency=low

=== modified file 'linaro-media-create'
--- linaro-media-create	2010-09-07 21:38:12 +0000
+++ linaro-media-create	2010-09-07 21:52:42 +0000
@@ -56,12 +56,12 @@
 get_mmcs_by_id() {
 if [ ! ${IMAGE_FILE} ]; then
   for device in /dev/disk/by-id/*; do
-    if [ `realpath $device` = $MMC ]; then
+    if [ `realpath "$device"` = $MMC ]; then
       if echo "$device" | grep -q -- "-part[0-9]*$"; then
         echo "device $MMC must not be a partition part ($device)" 1>&2
         exit 1
       fi
-      for part_id in `ls "$device-part"*`; do
+      for part_id in `ls "$device"-part*`; do
         part=`realpath $part_id`
         part_no=`echo $part_id | sed -e 's/.*-part//g'`
         # echo "part $part_no found: $part_id" 1>&2