From owner-svn-src-stable-8@FreeBSD.ORG Tue Jan 15 09:17:08 2013 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 4F091900; Tue, 15 Jan 2013 09:17:08 +0000 (UTC) (envelope-from bapt@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 4051775E; Tue, 15 Jan 2013 09:17:08 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0F9H8FD060019; Tue, 15 Jan 2013 09:17:08 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0F9H8Og060018; Tue, 15 Jan 2013 09:17:08 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201301150917.r0F9H8Og060018@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 15 Jan 2013 09:17:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r245452 - stable/8/usr.sbin/pkg X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 09:17:08 -0000 Author: bapt Date: Tue Jan 15 09:17:07 2013 New Revision: 245452 URL: http://svnweb.freebsd.org/changeset/base/245452 Log: MFC r244553,244594,244608,244639 In preparation for making 'pkg -N' the one true method of determining whether a system has been configured to use pkgng, cause /usr/sbin/pkg recognise a -N option and exit with a failure code when the pkg port is not installed Submitted by: matthew Modified: stable/8/usr.sbin/pkg/pkg.c Directory Properties: stable/8/usr.sbin/pkg/ (props changed) Modified: stable/8/usr.sbin/pkg/pkg.c ============================================================================== --- stable/8/usr.sbin/pkg/pkg.c Tue Jan 15 09:14:18 2013 (r245451) +++ stable/8/usr.sbin/pkg/pkg.c Tue Jan 15 09:17:07 2013 (r245452) @@ -452,6 +452,14 @@ main(__unused int argc, char *argv[]) getenv("LOCALBASE") ? getenv("LOCALBASE") : _LOCALBASE); if (access(pkgpath, X_OK) == -1) { + /* + * 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) + errx(EXIT_FAILURE, "pkg is not installed"); + /* * Do not ask for confirmation if either of stdin or stdout is * not tty. Check the environment to see if user has answer