Bug#256100: marked as done (XSI:isms in debian/update-grub and util/mkbimage)
Debian Bug Tracking System
owner@bugs.debian.org
Thu, 22 Jul 2004 16:33:06 -0700
Your message dated Thu, 22 Jul 2004 19:17:09 -0400
with message-id <E1BnmoH-00047m-00@newraff.debian.org>
and subject line Bug#256100: fixed in grub 0.95+cvs20040624-6
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--------------------------------------
Received: (at maintonly) by bugs.debian.org; 25 Jun 2004 00:18:05 +0000
>From tao@acc.umu.se Thu Jun 24 17:18:05 2004
Return-path: <tao@acc.umu.se>
Received: from khan.acc.umu.se [130.239.18.139] (postfix)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1BdePt-00011v-00; Thu, 24 Jun 2004 17:18:05 -0700
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id C9F02D28C
for <maintonly@bugs.debian.org>; Fri, 25 Jun 2004 02:18:03 +0200 (MEST)
Received: by khan.acc.umu.se (Postfix, from userid 23136)
id 4E71BD361; Fri, 25 Jun 2004 02:17:59 +0200 (MEST)
Date: Fri, 25 Jun 2004 02:17:59 +0200
From: David Weinehall <tao@debian.org>
To: maintonly@bugs.debian.org
Subject: XSI:isms in debian/update-grub and util/mkbimage
Message-ID: <20040625001759.GE1130@khan.acc.umu.se>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.4.1i
X-Accept-Language: Swedish, English
X-GPG-Fingerprint: 7ACE 0FB0 7A74 F994 9B36 E1D1 D14E 8526 DC47 CA16
X-GPG-Key: http://www.acc.umu.se/~tao/files/pubkey_dc47ca16.gpg.asc
X-Virus-Scanned: by amavisd-new at acc.umu.se
Delivered-To: maintonly@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-8.0 required=4.0 tests=BAYES_00,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: grub
Version: 0.94+cvs20040511-1
Severity: minor
Tags: patch upstream
debian/update-grub and util/mkbimage contains use of XSI:isms `-a' and
`-o'. The included patch fixes this. Note that the extra ()'s in the
new version is because of the strict left-to-right precedence in
shell-scripts.
Regards: David Weinehall
diff -ur grub-0.94+cvs20040511-old/debian/update-grub grub-0.94+cvs20040511/debian/update-grub
--- grub-0.94+cvs20040511-old/debian/update-grub 2004-06-24 12:55:30.000000000 +0300
+++ grub-0.94+cvs20040511/debian/update-grub 2004-06-25 03:10:15.000000000 +0300
@@ -397,15 +397,15 @@
# this code only works if you stay only with kernel-image kernels.
- if [ ! $v1words -eq 6 -a $v1smp -eq 0 -o ! $v1words -eq 7 -a $v1smp -eq 1 ]; then
+ if ( [ ! $v1words -eq 6 ] && [ $v1smp -eq 0 ] ) || ( [ ! $v1words -eq 7 ] && [ $v1smp -eq 1 ] ); then
v1=$(echo $v1| cut -d" " -f1-4)" 0 "$(echo $v1| cut -d" " -f5-)
fi
- if [ ! $v2words -eq 6 -a $v2smp -eq 0 -o ! $v2words -eq 7 -a $v2smp -eq 1 ]; then
+ if ( [ ! $v2words -eq 6 ] && [ $v2smp -eq 0 ] ) || ( [ ! $v2words -eq 7 ] && [ $v2smp -eq 1 ] ); then
v2=$(echo $v2| cut -d" " -f1-4)" 0 "$(echo $v2| cut -d" " -f5-)
fi
result=0; v1finished=0; v2finished=0;
- while [ $result -eq 0 -a $v1finished -eq 0 -a $v2finished -eq 0 ];
+ while [ $result -eq 0 ] && [ $v1finished -eq 0 ] && [ $v2finished -eq 0 ];
do
if [ "$v1" = "" ]; then
v1comp=0; v1finished=1
@@ -645,7 +645,7 @@
newerKernels=""
for i in $sortedKernels ; do
res=$(CompareVersions "$kern" "$i")
- if [ "$kern" != "" -a "$res" -gt 0 ] ; then
+ if [ "$kern" != "" ] && [ "$res" -gt 0 ] ; then
newerKernels="$newerKernels $kern $i"
kern=""
else
diff -ur grub-0.94+cvs20040511-old/util/mkbimage grub-0.94+cvs20040511/util/mkbimage
--- grub-0.94+cvs20040511-old/util/mkbimage 2004-04-29 22:45:11.000000000 +0300
+++ grub-0.94+cvs20040511/util/mkbimage 2004-06-25 03:11:01.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
---------------------------------------
Received: (at 256100-close) by bugs.debian.org; 22 Jul 2004 23:19:48 +0000
>From katie@ftp-master.debian.org Thu Jul 22 16:19:48 2004
Return-path: <katie@ftp-master.debian.org>
Received: from newraff.debian.org [208.185.25.31] (mail)
by spohr.debian.org with esmtp (Exim 3.35 1 (Debian))
id 1Bnmqp-0003vL-00; Thu, 22 Jul 2004 16:19:47 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1BnmoH-00047m-00; Thu, 22 Jul 2004 19:17:09 -0400
From: Robert Millan <rmh@debian.org>
To: 256100-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#256100: fixed in grub 0.95+cvs20040624-6
Message-Id: <E1BnmoH-00047m-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Thu, 22 Jul 2004 19:17:09 -0400
Delivered-To: 256100-close@bugs.debian.org
X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25
(1.212-2003-09-23-exp) on spohr.debian.org
X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Source: grub
Source-Version: 0.95+cvs20040624-6
We believe that the bug you reported is fixed in the latest version of
grub, which is due to be installed in the Debian FTP archive:
grub-disk_0.95+cvs20040624-6_all.deb
to pool/main/g/grub/grub-disk_0.95+cvs20040624-6_all.deb
grub-doc_0.95+cvs20040624-6_all.deb
to pool/main/g/grub/grub-doc_0.95+cvs20040624-6_all.deb
grub_0.95+cvs20040624-6.diff.gz
to pool/main/g/grub/grub_0.95+cvs20040624-6.diff.gz
grub_0.95+cvs20040624-6.dsc
to pool/main/g/grub/grub_0.95+cvs20040624-6.dsc
grub_0.95+cvs20040624-6_i386.deb
to pool/main/g/grub/grub_0.95+cvs20040624-6_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 256100@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Robert Millan <rmh@debian.org> (supplier of updated grub package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 23 Jul 2004 00:49:10 +0200
Source: grub
Binary: grub-disk grub grub-doc
Architecture: source i386 all
Version: 0.95+cvs20040624-6
Distribution: unstable
Urgency: low
Maintainer: Grub Maintainers <pkg-grub-devel@lists.alioth.debian.org>
Changed-By: Robert Millan <rmh@debian.org>
Description:
grub - GRand Unified Bootloader
grub-disk - GRUB bootable disk image
grub-doc - Documentation for GRand Unified Bootloader
Closes: 256100
Changes:
grub (0.95+cvs20040624-6) unstable; urgency=low
.
* Fix XSI-isms in update-grub and mkbimage. Thanks David Weinehall.
(Closes: #256100)
- patches/xsi_mkbimage.diff: New. Fix util/mkbimage.
- update-grub
* rules: Select only filesystems supported natively in Debian for installing
${fs}_stage1_5 files (non-native filesystems are supported in stage2).
* Fix syntax error introduced in previous upload.
- patches/raid.diff
- update-grub
Files:
a1fdf976ee6d77f567b3b9deb2d7b5c8 831 admin optional grub_0.95+cvs20040624-6.dsc
347864f3593adb5ac583355e9844797e 51329 admin optional grub_0.95+cvs20040624-6.diff.gz
c51ed352410d7147e9acdd084f28d73c 348350 admin optional grub_0.95+cvs20040624-6_i386.deb
27e6ead4466d3a91298c0a327bd63c9d 226246 admin optional grub-disk_0.95+cvs20040624-6_all.deb
354bffd495b8b307930e0b278c86b553 258964 doc optional grub-doc_0.95+cvs20040624-6_all.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
iD8DBQFBAEebC19io6rUCv8RAnLyAJ9BDSFbW/7y2okyUtIIqNH7VWZAawCeK7FW
jHVfYd43kAkCs4TFEyTd51I=
=SlEW
-----END PGP SIGNATURE-----