svn commit: r244594 - head/usr.sbin/pkg

[Matthew Seaman]

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);
 		}