Bug#258315: marked as done (XSI:isms in discover.init)
Your message dated Sun, 11 Jul 2004 04:17:06 -0400
with message-id <E1BjZWE-0002qp-00@newraff.debian.org>
and subject line Bug#258315: fixed in discover1 1.6.2
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; 8 Jul 2004 20:26:04 +0000
>From tao@acc.umu.se Thu Jul 08 13:26:04 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 1BifT2-0003ld-00; Thu, 08 Jul 2004 13:26:04 -0700
Received: from localhost (localhost [127.0.0.1])
by amavisd-new (Postfix) with ESMTP id E44E6D266
for <maintonly@bugs.debian.org>; Thu, 8 Jul 2004 22:26:02 +0200 (MEST)
Received: by khan.acc.umu.se (Postfix, from userid 23136)
id D8887D205; Thu, 8 Jul 2004 22:26:00 +0200 (MEST)
Date: Thu, 8 Jul 2004 22:26:00 +0200
From: David Weinehall <tao@debian.org>
To: "Debian Bug Tracking System, Maintonly" <maintonly@bugs.debian.org>
Subject: XSI:isms in discover.init
Message-ID: <[🔎] 20040708202600.GG10540@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=-7.0 required=4.0 tests=BAYES_00,DATING,HAS_PACKAGE
autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level:
Package: discover1
Version: 1.6.1
Severity: minor
Tags: patch
discover.init contains use of the XSI:isms `-a' and `-o' in tests.
This patch fixes this.
Rationale:
Policy 10.4
http://www.opengroup.org/onlinepubs/009695399/utilities/test.html
Regards: David Weinehall
diff -ur discover1-1.6.1-old/discover/discover.init discover1-1.6.1/discover/discover.init
--- discover1-1.6.1-old/discover/discover.init 2004-06-16 05:12:52.000000000 +0300
+++ discover1-1.6.1/discover/discover.init 2004-07-08 21:16:36.000000000 +0300
@@ -99,7 +99,7 @@
for MODULE in $MODULES
do
# See if we should skip $MODULE:
- if [ "$MODULE" = "ignore" -o "$MODULE" = "unknown" ]
+ if [ "$MODULE" = "ignore" ] || [ "$MODULE" = "unknown" ]
then
continue
fi
@@ -163,16 +163,16 @@
for CDROM in $(run_discover --device cdrom | sort)
do
ALTCDROM=$(echo $CDROM | sed 's/\/dev\/scd/\/dev\/sr/')
- if [ ! -e $CDROM -a ! -e $ALTCDROM ]
+ if [ ! -e $CDROM ] && [ ! -e $ALTCDROM ]
then
echo -n "discover reports that $CDROM is a CD/DVD device, but it and $ALTCDROM " >&2
echo "do not exist. Not updating /dev/cdrom$CDNUM." >&2
- elif [ ! -b $CDROM -a ! -e $ALTCDROM ]
+ elif [ ! -b $CDROM ] && [ ! -e $ALTCDROM ]
then
echo -n "discover reports that $CDROM is a CD/DVD device, but it and $ALTCDROM " >&2
echo "are not block devices. Not updating /dev/cdrom$CDNUM." >&2
- elif [ -e /dev/cdrom$CDNUM -a ! -L /dev/cdrom$CDNUM ]
+ elif [ -e /dev/cdrom$CDNUM ] && [ ! -L /dev/cdrom$CDNUM ]
then
echo -n "/dev/cdrom$CDNUM exists and is not a symlink. Not updating " >&2
echo "/dev/cdrom$CDNUM." >&2
@@ -193,7 +193,7 @@
# Link /dev/cdrom to the appropriate device:
if [ -e /dev/cdrom0 ]
then
- if [ -L /dev/cdrom -o ! -e /dev/cdrom ]
+ if [ -L /dev/cdrom ] || [ ! -e /dev/cdrom ]
then
ln -fs /dev/cdrom0 /dev/cdrom
# link the mountpoint only if nothing is mounted there
---------------------------------------
Received: (at 258315-close) by bugs.debian.org; 11 Jul 2004 08:19:41 +0000
>From katie@ftp-master.debian.org Sun Jul 11 01:19:41 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 1BjZYj-0005lY-00; Sun, 11 Jul 2004 01:19:41 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
id 1BjZWE-0002qp-00; Sun, 11 Jul 2004 04:17:06 -0400
From: Joshua Kwan <joshk@triplehelix.org>
To: 258315-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#258315: fixed in discover1 1.6.2
Message-Id: <E1BjZWE-0002qp-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Sun, 11 Jul 2004 04:17:06 -0400
Delivered-To: 258315-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:
X-CrossAssassin-Score: 10
Source: discover1
Source-Version: 1.6.2
We believe that the bug you reported is fixed in the latest version of
discover1, which is due to be installed in the Debian FTP archive:
discover1-udeb_1.6.2_i386.udeb
to pool/main/d/discover1/discover1-udeb_1.6.2_i386.udeb
discover1_1.6.2.dsc
to pool/main/d/discover1/discover1_1.6.2.dsc
discover1_1.6.2.tar.gz
to pool/main/d/discover1/discover1_1.6.2.tar.gz
discover1_1.6.2_i386.deb
to pool/main/d/discover1/discover1_1.6.2_i386.deb
libdiscover1-dev_1.6.2_i386.deb
to pool/main/d/discover1/libdiscover1-dev_1.6.2_i386.deb
libdiscover1-pic_1.6.2_i386.deb
to pool/main/d/discover1/libdiscover1-pic_1.6.2_i386.deb
libdiscover1_1.6.2_i386.deb
to pool/main/d/discover1/libdiscover1_1.6.2_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 258315@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Joshua Kwan <joshk@triplehelix.org> (supplier of updated discover1 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: Sat, 10 Jul 2004 13:37:53 -0700
Source: discover1
Binary: libdiscover1 discover1 libdiscover1-pic discover1-udeb libdiscover1-dev
Architecture: source i386
Version: 1.6.2
Distribution: unstable
Urgency: low
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Joshua Kwan <joshk@triplehelix.org>
Description:
discover1 - hardware identification system
discover1-udeb - hardware identification library (udeb) (udeb)
libdiscover1 - hardware identification library
libdiscover1-dev - hardware identification library development files
libdiscover1-pic - hardware identification library - static PIC version
Closes: 166675 255758 256174 256371 256710 256989 257396 257649 258305 258315 258664
Changes:
discover1 (1.6.2) unstable; urgency=low
.
* Petter Reinholdtsen
- Add %i format option, to print the device ID (PCI id) of the
device in question. (Closes: #166675)
- Correct discover(8) manual page. The module names should match
the ones in kernel 2.4.26, not 2.2.20.
- Avoid doing ioctl() and close() with file descriptor -1. Patch
from Steinar H. Gunderson.
- Fixed typo in SCSI disk probing.
* Joshua Kwan
- Fix XSIisms in the init script. (Closes: #258315)
- Pretty up the init script, remove some XXXes involving use of awk,
replace with calls to sed and shell read loops.
- Allow discover -h and discover --help to work correctly, as well
as -v / --version. Ugly hack in ddetect no longer necessary.
- Don't allow other arguments to discover.init and show a usage blurb
if that happens.
- update-initrd behaves with same BLOCK and INODES size as 2.4, per
consultation with debian-kernel. (Closes: #257649)
- Add versioned dependency for libdiscover1 using the shlibs file.
* Translations
- Debconf
- Updated Basque. Closes: #255758
- Updated Ukranian. Closes: #256371
- Added Catalan. Closes: #256710
- Updated Hungarian. Closes: #257396
- Updated Brazilian Portuguese. Closes: #258664
- Programs
- Updated Greek. Closes: #256174, #256989
- Updated Catalan.
- Updated French
- Updated Simplified Chinese
- Updated Hungarian
- Updated Lithuanian. Closes: #258305
- Updated Dutch
Files:
218a77b0465e0c4e6644c1f0a7fb7305 1460 admin optional discover1_1.6.2.dsc
9aa8b47cd9ab8453f5c745d6caf0adba 613362 admin optional discover1_1.6.2.tar.gz
d9d6b68173ebc8e66189146c31317af7 81816 admin optional discover1_1.6.2_i386.deb
c931d8f6912640b2dc2afc3955271001 79464 libs optional libdiscover1_1.6.2_i386.deb
b3019cbc35e302c1e50cf18e67b4c15a 55790 libdevel optional libdiscover1-dev_1.6.2_i386.deb
5833f6e9c3a3473d4e95d2a6ee78a5bc 54376 libs extra libdiscover1-pic_1.6.2_i386.deb
70ba50eb341f7c521649b2136bb04f59 34550 debian-installer extra discover1-udeb_1.6.2_i386.udeb
package-type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)
Comment: http://triplehelix.org/~joshk/pubkey_gpg.asc
iQIVAwUBQPD0YaOILr94RG8mAQK79RAAzm9D5HvXv4dn59xHPPrOFD+LIVUvkngw
4QMkBXc1OZN/BySEaNiovZLQZ9bDMv2qTAMet6pGYHMP0avCPaATbvRe9AvR71JV
48TH92bSSAIVCQTJohAwAv+azxUAdJYIzYFy1JFI/WSho4MYWbXgKoi6oZB11Cuu
tilCPPXcDe5DzCpOT+uAusYwk/O7oX6ESBdwDI3iWQOEqA/KViR/WKwExDXdGLgg
RV3EILl9Cr1D/2LtW1PA5aHLuDx0EXKCaX7mp6F4AKq2OaM7zA2QCP3AldMIu/mb
oFwfgyjDMHUkD1qLvEFlIrD2TD8nNBuZMuY3UMbbwQrfTAoi10vLwqVokyDU3MoT
DZOvKsWthzW6OqEWNKR/W1LfbSr/gYNWbnKhqtasb9mRT0ebkiygGgcddYYv61N3
XGGhck0psxeN2SLjwXiJIAJSfz5POt0KHmIyXdpUhn+pNEP1yy8b4fvdBaby1+Fg
c9d08ttn7Btz+6E6WUbO7aqH6tfZE/e5YVrePR04iwFcjiYMEsmhjvkfPHtU5OQ9
+s/UexAuP3PxE8eYjuKCzzfngyMy7lisYez/k0qrYmCdzeWuDOt+t4Kh81MuhcPY
uLfqQVHqkBRpg8iynyR1RCZfkkemjoqzzQwSzu0325zfFvohIa/7lrjFdo9HWvpb
WCEOh/Lil5I=
=uM9m
-----END PGP SIGNATURE-----
Reply to: