[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#256302: marked as done (XSI:isms in several scripts)



Your message dated Mon, 19 Jul 2004 15:47:30 -0400
with message-id <E1Bme6k-00031u-00@newraff.debian.org>
and subject line Bug#256302: fixed in dpkg 1.10.23
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 23:38:00 +0000
>From tao@acc.umu.se Fri Jun 25 16:38:00 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 1Be0Ge-0005pZ-00; Fri, 25 Jun 2004 16:38:00 -0700
Received: from localhost (localhost [127.0.0.1])
	by amavisd-new (Postfix) with ESMTP id 7F7AAD22A
	for <maintonly@bugs.debian.org>; Sat, 26 Jun 2004 01:37:58 +0200 (MEST)
Received: by khan.acc.umu.se (Postfix, from userid 23136)
	id D7B60D22E; Sat, 26 Jun 2004 01:37:54 +0200 (MEST)
Date: Sat, 26 Jun 2004 01:37:54 +0200
From: David Weinehall <tao@debian.org>
To: "Debian Bug Tracking System, Maintonly" <maintonly@bugs.debian.org>
Subject: XSI:isms in several scripts
Message-ID: <20040625233754.GC7888@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,
	REMOVE_IN_QUOTES autolearn=no version=2.60-bugs.debian.org_2004_03_25
X-Spam-Level: 

Package: dpkg
Version: 1.10.22
Severity: minor
Tags: patch

Several scripts in dpkg contains use of the XSI:isms `-a' and `-o' for
`test'/`['.  This is technically a policy-violation.

Rationale:

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


Regards: David Weinehall

diff -ur dpkg-1.10.22-old/debian/dpkg.postinst dpkg-1.10.22/debian/dpkg.postinst
--- dpkg-1.10.22-old/debian/dpkg.postinst	2004-06-02 00:18:15.000000000 +0300
+++ dpkg-1.10.22/debian/dpkg.postinst	2004-06-26 01:51:30.000000000 +0300
@@ -19,7 +19,7 @@
 }
 
 if [ "x$1" = xconfigure ]; then
-	if [ -z "$2" -a ! -f /etc/dpkg/dpkg.cfg ] ; then
+	if [ -z "$2" ] && [ ! -f /etc/dpkg/dpkg.cfg ] ; then
 		cp /usr/share/doc/dpkg/dpkg.cfg /etc/dpkg
 	fi
 
@@ -35,7 +35,7 @@
 					continue
 				fi
 				h="`echo $g | sed -e 's/^K/S/'`"
-				if ! [ -L $h -a -L $g ] \
+				if ! [ -L $h ] && [ -L $g ] \
 				  || [ "`ls -Li $g 2>/dev/null | awk '{print $1}'`" != \
 				       "`ls -Li $h 2>/dev/null | awk '{print $1}'`" ]
 				then
@@ -114,8 +114,8 @@
 	esac
 fi
 
-if [ -d /usr/info -a ! -L /usr/info -a ! -L /usr/info/dir \
-		-a -f /usr/info/dir ]; then              
+if [ -d /usr/info ] && [ ! -L /usr/info ] && [ ! -L /usr/info/dir ] \
+		&& [ -f /usr/info/dir ]; then              
 	echo Moving /usr/info/dir to /usr/share/info/dir.
 	mv /usr/info/dir /usr/share/info/dir
 	if [ -f /usr/info/dir.old ]; then
diff -ur dpkg-1.10.22-old/debian/dpkg.prerm dpkg-1.10.22/debian/dpkg.prerm
--- dpkg-1.10.22-old/debian/dpkg.prerm	2004-06-02 00:18:15.000000000 +0300
+++ dpkg-1.10.22/debian/dpkg.prerm	2004-06-26 01:53:55.000000000 +0300
@@ -2,7 +2,7 @@
 
 set -e
 
-if [ ! \( "$1" = "upgrade" -o "$1" = "remove" \) ]; then
+if [ ! "$1" = "upgrade" ] && [ ! "$1" = "remove" ]; then
 	exit 0
 fi
 
diff -ur dpkg-1.10.22-old/methods/disk.setup dpkg-1.10.22/methods/disk.setup
--- dpkg-1.10.22-old/methods/disk.setup	2004-06-02 00:18:16.000000000 +0300
+++ dpkg-1.10.22/methods/disk.setup	2004-06-26 01:55:48.000000000 +0300
@@ -172,7 +172,7 @@
 			read response
 			response="`echo \"$response\" | sed -e 's/[ 	]*$//'`"
 			if expr "$response" : '[0-9][0-9]*$' >/dev/null && \
-			   [ $response -ge 1 -a $response -le $ncdroms ]
+			   [ $response -ge 1 ] && [ $response -le $ncdroms ]
 			then
 				mountpoint="`sed -n $response'p' <$tp.l`"
 				echo
@@ -229,7 +229,7 @@
 		echo -n \
 "What is the name of the NFS server ? [$defaultnfsserver]  "
 		read response
-		if [ -z "$response" -a -n "$defaultnfsserver" ]
+		if [ -z "$response" ] && [ -n "$defaultnfsserver" ]
 		then
 			response="$defaultnfsserver"
 		fi
@@ -262,7 +262,7 @@
 What is the pathname on the NFS server of the filesystem with
 the Debian files? [$defaultnfsrempath]  "
 		read response
-		if [ -z "$response" -a -n "$defaultnfsrempath" ]
+		if [ -z "$response" ] && [ -n "$defaultnfsrempath" ]
 		then
 			response="$defaultnfsrempath"
 		else
@@ -444,7 +444,7 @@
 		check_binary $1 "$hierbase/$3/binary-$iarch"
 	fi
 
-	if [ $option = cdrom -a $2 = nf -a -z "$this_binary" ]
+	if [ $option = cdrom ] && [ $2 = nf ] && [ -z "$this_binary" ]
 	then
 		echo '
 Note: most CD-ROM distributions of Debian do not include programs
@@ -453,7 +453,7 @@
 distribution for profit on a CD-ROM - ie they are not free software.
 If you wish to install these programs you'\''ll have to get them from an
 alternative source.'
-	elif [ $2 = lcl -a -z "$this_binary" ]
+	elif [ $2 = lcl ] && [ -z "$this_binary" ]
 	then
 		echo '
 Note: By default there is no `local'\'' directory. It is intended for 
@@ -466,7 +466,7 @@
 Which directory contains the *.deb packages from the $1 distribution
 area (this directory is named \`$3/binary-$iarch' on the distribution site) ?
 Say \`none' if this area is not available."
-		if [ $2 != main -a -z "$defaultbinary" ]
+		if [ $2 != main ] && [ -z "$defaultbinary" ]
 		then
 			defaultbinary=none
 		fi
@@ -474,7 +474,7 @@
 "Enter _$1_ binary dir. [$4]
  ?  "
 		read response
-		if [ -z "$response" -a -n "$defaultbinary" ]
+		if [ -z "$response" ] && [ -n "$defaultbinary" ]
 		then
 			response="$defaultbinary"
 		fi
@@ -519,7 +519,7 @@
 [$5]
  ?  "
 			read response
-			if [ -z "$response" -a -n "$5" ]
+			if [ -z "$response" ] && [ -n "$5" ]
 			then
 				response="$5"
 			fi
diff -ur dpkg-1.10.22-old/methods/disk.update dpkg-1.10.22/methods/disk.update
--- dpkg-1.10.22-old/methods/disk.update	2004-06-02 00:18:16.000000000 +0300
+++ dpkg-1.10.22/methods/disk.update	2004-06-26 01:56:56.000000000 +0300
@@ -9,9 +9,9 @@
 
 . ./shvar.$option
 
-if [ -z "$p_main_packages" -a -z "$p_ctb_packages" -a \
-     -z "$p_nf_packages" -a -z "$p_nus_packages " -a \
-     -z "$p_lcl_packages" ]
+if [ -z "$p_main_packages" ] && [ -z "$p_ctb_packages" ] && \
+   [ -z "$p_nf_packages" ] && [ -z "$p_nus_packages " ] && \
+   [ -z "$p_lcl_packages" ]
 then
 	echo '
 No Packages files available, cannot update available packages list.
diff -ur dpkg-1.10.22-old/scripts/dpkg-buildpackage.sh dpkg-1.10.22/scripts/dpkg-buildpackage.sh
--- dpkg-1.10.22-old/scripts/dpkg-buildpackage.sh	2004-06-02 00:18:16.000000000 +0300
+++ dpkg-1.10.22/scripts/dpkg-buildpackage.sh	2004-06-26 02:01:37.000000000 +0300
@@ -48,7 +48,7 @@
 
 rootcommand=''
 signcommand=""
-if [ -e $GNUPGHOME/secring.gpg -o -e $HOME/.gnupg/secring.gpg ] && \
+if ( [ -e $GNUPGHOME/secring.gpg ] || [ -e $HOME/.gnupg/secring.gpg ] ) && \
 		command -v gpg > /dev/null 2>&1; then
 	signcommand=gpg
 elif command -v pgp > /dev/null 2>&1 ; then
@@ -120,7 +120,7 @@
 
 if test -n "$forcesigninterface" ; then
   signinterface=$forcesigninterface
-if [ "$signinterface" != "gpg" -a "$signinterface" != "pgp" ] ; then
+if [ "$signinterface" != "gpg" ] && [ "$signinterface" != "pgp" ] ; then
 	echo >&2 "$progname: invalid sign interface specified"
 	exit 1
 fi
@@ -200,7 +200,7 @@
 	withecho $rootcommand debian/rules $binarytarget
 fi
 if [ "$usepause" = "true" ] && \
-   [  "$signchanges" != ":" -o \( -z "$binaryonly"  -a "$signsource" != ":" \) ] ; then
+   ( [ "$signchanges" != ":" ] || ( [ -z "$binaryonly" ] && [ "$signsource" != ":" ] ) ) ; then
     echo Press the return key to start signing process
     read dummy_stuff
 fi
diff -ur dpkg-1.10.22-old/scripts/dpkg-name.sh dpkg-1.10.22/scripts/dpkg-name.sh
--- dpkg-1.10.22-old/scripts/dpkg-name.sh	2004-06-02 00:18:16.000000000 +0300
+++ dpkg-1.10.22/scripts/dpkg-name.sh	2004-06-26 02:03:12.000000000 +0300
@@ -70,7 +70,7 @@
 
 		a=`dpkg-deb -f -- "$1" architecture`;
 		a=`echo $a|sed -e 's/ *//g'`;
-		if [ -z "$a" -a -n "$noarchitecture" ]; # arch field empty, or ignored
+		if [ -z "$a" ] && [ -n "$noarchitecture" ]; # arch field empty, or ignored
 		then
 			a=`dpkg --print-installation-architecture`;
 			stderr "assuming architecture \`"$a"' for \`"$1"'";
@@ -103,7 +103,7 @@
 				s="no-section";
 				stderr "assuming section \`"no-section"' for \`"$1"'";
 			fi
-			if [ "$s" != "non-free" -a "$s" != "contrib" -a "$s" != "no-section" ];
+			if [ "$s" != "non-free" ] && [ "$s" != "contrib" ] && [ "$s" != "no-section" ];
 			then
 				dir=`echo unstable/binary-$a/$s`;
 			else
@@ -147,7 +147,7 @@
 		if [ $newname -ef "$1" ]; # same device and inode numbers
 		then
 			stderr "skipping \`"$1"'";
-		elif [ -f $newname -a -z "$overwrite" ];
+		elif [ -f $newname ] && [ -z "$overwrite" ];
 		then
 			stderr "can't move \`"$1"' to existing file";
 		elif `$command "$1" $newname`;

---------------------------------------
Received: (at 256302-close) by bugs.debian.org; 19 Jul 2004 19:53:53 +0000
>From katie@ftp-master.debian.org Mon Jul 19 12:53:53 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 1BmeCv-0002jZ-00; Mon, 19 Jul 2004 12:53:53 -0700
Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian))
	id 1Bme6k-00031u-00; Mon, 19 Jul 2004 15:47:30 -0400
From: Scott James Remnant <scott@netsplit.com>
To: 256302-close@bugs.debian.org
X-Katie: $Revision: 1.51 $
Subject: Bug#256302: fixed in dpkg 1.10.23
Message-Id: <E1Bme6k-00031u-00@newraff.debian.org>
Sender: Archive Administrator <katie@ftp-master.debian.org>
Date: Mon, 19 Jul 2004 15:47:30 -0400
Delivered-To: 256302-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: 13

Source: dpkg
Source-Version: 1.10.23

We believe that the bug you reported is fixed in the latest version of
dpkg, which is due to be installed in the Debian FTP archive:

dpkg-dev_1.10.23_all.deb
  to pool/main/d/dpkg/dpkg-dev_1.10.23_all.deb
dpkg-doc_1.10.23_all.deb
  to pool/main/d/dpkg/dpkg-doc_1.10.23_all.deb
dpkg_1.10.23.dsc
  to pool/main/d/dpkg/dpkg_1.10.23.dsc
dpkg_1.10.23.tar.gz
  to pool/main/d/dpkg/dpkg_1.10.23.tar.gz
dpkg_1.10.23_i386.deb
  to pool/main/d/dpkg/dpkg_1.10.23_i386.deb
dselect_1.10.23_i386.deb
  to pool/main/d/dpkg/dselect_1.10.23_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 256302@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Scott James Remnant <scott@netsplit.com> (supplier of updated dpkg 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: Mon, 19 Jul 2004 19:52:14 +0100
Source: dpkg
Binary: dpkg-doc dpkg dselect dpkg-dev dpkg-static
Architecture: source all i386
Version: 1.10.23
Distribution: unstable
Urgency: low
Maintainer: Dpkg Development <debian-dpkg@lists.debian.org>
Changed-By: Scott James Remnant <scott@netsplit.com>
Description: 
 dpkg       - Package maintenance system for Debian
 dpkg-dev   - Package building tools for Debian
 dpkg-doc   - Dpkg Internals Documentation
 dselect    - a user tool to manage Debian packages
Closes: 133640 246158 246159 246160 246161 246162 246163 246164 252346 252407 252586 254175 254180 254209 254590 254598 256302
Changes: 
 dpkg (1.10.23) unstable; urgency=low
 .
   The "Let the Wookie win" Release.
 .
   * Updated hurd start-stop-daemon support.  Closes: #133640, #254180.
   * Removed usage of non-POSIX test options.  Closes: #256302.
 .
   * Architecture Support:
     - Renamed x86-64 to amd64.  Closes: #252346, #254598.
   * Documentation:
     - Correct typo in dpkg-divert(8).  Closes: #254175.
   * New Translations:
     - Korean (Changwoo Ryu).  Closes: #254590.
   * Updated Translations:
     - Catalan (Jordi Mallach).
     - Danish (Claus Hindsgaul).  Closes: #252407.
     - French (Christian Perrier).  Closes: #252586.
     - Italian (Lele Gaifax).
     - Polish (Bartosz Fenski).  Closes: #254209.
     - Spanish manpages (Ruben Porras).  Closes: #246158, #246159, #246160,
       #246161, #246162, #246163, #246164.
Files: 
 2eb35b462d81826455016fad6c5e8f3a 798 base required dpkg_1.10.23.dsc
 94a845ab0e14deb196d43e03c48a16b9 1763248 base required dpkg_1.10.23.tar.gz
 d6498369a2404180e10950ff1162ccec 1341122 base required dpkg_1.10.23_i386.deb
 edf5d858fc64757ef43855935ff961c7 119848 base required dselect_1.10.23_i386.deb
 2eabc2d309da69a9cb0449652e65221b 165728 utils standard dpkg-dev_1.10.23_all.deb
 bb925ebd2e7c47eacab34ed4cc171941 10612 doc optional dpkg-doc_1.10.23_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFA/BqrIexP3IStZ2wRAn7qAJ45IerZoUtRwmicirNhEE6BFlbESACgo//G
tnS5yOFrND1ZGS/aaL8BZfs=
=SC/e
-----END PGP SIGNATURE-----



Reply to: