Bug#261570: Missed XSI:isms...

[David Weinehall]

Package: grub
Version: 0.95+cvs20040624-6
Severity: minor
Tags: patch

Doh.  I seem to have missed out a `local' in debian/update-grub and
a couple of `-a' in util/mkbimage.  The included patch fixes this.

Rationale:
Policy 10.4
http://www.opengroup.org/onlinepubs/009695399/utilities/test.html


Regards: David Weinehall

diff -ur grub-0.95+cvs20040624-old/debian/update-grub grub-0.95+cvs20040624/debian/update-grub
--- grub-0.95+cvs20040624-old/debian/update-grub	2004-07-25 18:14:29.000000000 +0300
+++ grub-0.95+cvs20040624/debian/update-grub	2004-07-26 21:55:32.000000000 +0300
@@ -201,7 +201,6 @@
 # Calls OS-specific convert, and returns a default of
 # (hd0,0) if anything goes wrong
 convert_default () {
-	local tmp
 	if tmp=$(convert $1 2>/dev/null) ; then
 		echo $tmp
 	else
diff -ur grub-0.95+cvs20040624-old/util/mkbimage grub-0.95+cvs20040624/util/mkbimage
--- grub-0.95+cvs20040624-old/util/mkbimage	2004-04-29 22:45:11.000000000 +0300
+++ grub-0.95+cvs20040624/util/mkbimage	2004-07-26 21:57:09.000000000 +0300
@@ -232,10 +232,10 @@
 
 if [ ! "$image_type" ]; then
 	image_type=hd;
-elif [ "$image_type" != "1.20" -a "$image_type" != "1.44" \
-  -a "$image_type" != "1.60" -a "$image_type" != "1.68" \
-  -a "$image_type" != "2.88" -a "$image_type" != "1.74" \
-  -a "$image_type" != "hd" -a "$image_type" != "1.60" ] ; then
+elif [ "$image_type" != "1.20" ] && [ "$image_type" != "1.44" ] && \
+     [ "$image_type" != "1.60" ] && [ "$image_type" != "1.68" ] && \
+     [ "$image_type" != "2.88" ] && [ "$image_type" != "1.74" ] && \
+     [ "$image_type" != "hd" ] && [ "$image_type" != "1.60" ] ; then
   error wrong_type ;
 fi