From owner-svn-src-head@FreeBSD.ORG  Sun Dec 23 20:17:10 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id 78D18170;
 Sun, 23 Dec 2012 20:17:10 +0000 (UTC)
 (envelope-from pawel@dawidek.net)
Received: from mail.dawidek.net (garage.dawidek.net [91.121.88.72])
 by mx1.freebsd.org (Postfix) with ESMTP id 35F6E8FC13;
 Sun, 23 Dec 2012 20:17:09 +0000 (UTC)
Received: from localhost (static254.debica228.tnp.pl [87.116.228.254])
 by mail.dawidek.net (Postfix) with ESMTPSA id 73E59205;
 Sun, 23 Dec 2012 21:14:51 +0100 (CET)
Date: Sun, 23 Dec 2012 21:17:05 +0100
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Matthew Seaman <matthew@FreeBSD.org>
Subject: Re: svn commit: r244608 - head/usr.sbin/pkg
Message-ID: <20121223201704.GA1436@garage.freebsd.pl>
References: <201212231122.qBNBMIXb081427@svn.freebsd.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature"; boundary="GvXjxJ+pjyke8COw"
Content-Disposition: inline
In-Reply-To: <201212231122.qBNBMIXb081427@svn.freebsd.org>
X-OS: FreeBSD 10.0-CURRENT amd64
User-Agent: Mutt/1.5.21 (2010-09-15)
Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org,
 src-committers@freebsd.org
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 23 Dec 2012 20:17:10 -0000


--GvXjxJ+pjyke8COw
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sun, Dec 23, 2012 at 11:22:18AM +0000, Matthew Seaman wrote:
> Author: matthew (ports committer)
> Date: Sun Dec 23 11:22:18 2012
> New Revision: 244608
> URL: http://svnweb.freebsd.org/changeset/base/244608
>=20
> Log:
>   Third time's the charm.  pkg -N output needs to go to stderr.
>  =20
>   Approved by:	bapt
>   MFC after:	2 weeks
>=20
> Modified:
>   head/usr.sbin/pkg/pkg.c
>=20
> Modified: head/usr.sbin/pkg/pkg.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D
> --- head/usr.sbin/pkg/pkg.c	Sun Dec 23 10:21:01 2012	(r244607)
> +++ head/usr.sbin/pkg/pkg.c	Sun Dec 23 11:22:18 2012	(r244608)
> @@ -457,10 +457,8 @@ main(__unused int argc, char *argv[])
>  		 * a system is configured to use pkg, don't bootstrap pkg
>  		 * when that argument is given as argv[1].
>  		 */
> -		if ( argv[1] !=3D NULL && strcmp(argv[1], "-N") =3D=3D 0) {
> -			printf("%s", "pkg is not installed\n");
> -			exit(EXIT_FAILURE);
> -		}
> +		if ( argv[1] !=3D NULL && strcmp(argv[1], "-N") =3D=3D 0)
> +			errx(EXIT_FAILURE, "pkg is not installed\n");

How about removing space after 'if (' and redundant '\n'?

--=20
Pawel Jakub Dawidek                       http://www.wheelsystems.com
FreeBSD committer                         http://www.FreeBSD.org
Am I Evil? Yes, I Am!                     http://tupytaj.pl

--GvXjxJ+pjyke8COw
Content-Type: application/pgp-signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (FreeBSD)

iEYEARECAAYFAlDXZsAACgkQForvXbEpPzRe5wCg42/xjBdDW5A8RfMtZJ8lC/Kc
dEMAn35bdDpB75F37yPapW6VthHLHyui
=mGC+
-----END PGP SIGNATURE-----

--GvXjxJ+pjyke8COw--