From owner-svn-src-head@FreeBSD.ORG  Sat Dec 22 15:13:17 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 97AF71AC;
 Sat, 22 Dec 2012 15:13:17 +0000 (UTC)
 (envelope-from matthew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7CBF68FC13;
 Sat, 22 Dec 2012 15:13:17 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBMFDHFN000658;
 Sat, 22 Dec 2012 15:13:17 GMT (envelope-from matthew@svn.freebsd.org)
Received: (from matthew@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBMFDHBS000657;
 Sat, 22 Dec 2012 15:13:17 GMT (envelope-from matthew@svn.freebsd.org)
Message-Id: <201212221513.qBMFDHBS000657@svn.freebsd.org>
From: Matthew Seaman <matthew@FreeBSD.org>
Date: Sat, 22 Dec 2012 15:13:17 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r244594 - head/usr.sbin/pkg
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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: Sat, 22 Dec 2012 15:13:17 -0000

Author: matthew (ports committer)
Date: Sat Dec 22 15:13:16 2012
New Revision: 244594
URL: http://svnweb.freebsd.org/changeset/base/244594

Log:
  Switch from 'pkg -n' to 'pkg -N' as the test for pkgn activation
  status. '-n' is already used extensively elsewhere in pkgng (to mean
  'dry-run') and this reduces the potential confusion
  
  Submitted by:	eadler
  Approved by:	bapt
  MFC after:	2 weeks

Modified:
  head/usr.sbin/pkg/pkg.c

Modified: head/usr.sbin/pkg/pkg.c
==============================================================================
--- head/usr.sbin/pkg/pkg.c	Sat Dec 22 15:01:29 2012	(r244593)
+++ head/usr.sbin/pkg/pkg.c	Sat Dec 22 15:13:16 2012	(r244594)
@@ -453,11 +453,11 @@ main(__unused int argc, char *argv[])
 
 	if (access(pkgpath, X_OK) == -1) {
 		/* 
-		 * To allow 'pkg -n' to be used as a reliable test for whether
+		 * To allow 'pkg -N' to be used as a reliable test for whether
 		 * a system is configured to use pkg, don't bootstrap pkg
 		 * when that argument is given as argv[1].
 		 */
-		if ( argv[1] != NULL && strcmp(argv[1], "-n") == 0) {
+		if ( argv[1] != NULL && strcmp(argv[1], "-N") == 0) {
 			printf("%s", "pkg is not installed\n");
 			exit(EXIT_FAILURE);
 		}