From owner-svn-src-all@FreeBSD.ORG  Mon Sep 10 08:14:59 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 188EE1065670;
	Mon, 10 Sep 2012 08:14:59 +0000 (UTC)
	(envelope-from bapt@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04BAB8FC12;
	Mon, 10 Sep 2012 08:14:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8A8EwYw018778;
	Mon, 10 Sep 2012 08:14:58 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8A8EwkI018776;
	Mon, 10 Sep 2012 08:14:58 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201209100814.q8A8EwkI018776@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Mon, 10 Sep 2012 08:14:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240300 - releng/9.1/usr.sbin/pkg
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 10 Sep 2012 08:14:59 -0000

Author: bapt
Date: Mon Sep 10 08:14:58 2012
New Revision: 240300
URL: http://svn.freebsd.org/changeset/base/240300

Log:
  MFC: r239663, r239664
  
  change ALWAYS_ASSUME_YES to ASSUME_ALWAYS_YES for consistency with pkg(8)
  if not on a tty prompt about the missing pkg(8) but default on 'no' except if
  ASSUME_ALWAYS_YES is set
  
  Approved by:	re (kib)

Modified:
  releng/9.1/usr.sbin/pkg/pkg.c
Directory Properties:
  releng/9.1/usr.sbin/pkg/   (props changed)

Modified: releng/9.1/usr.sbin/pkg/pkg.c
==============================================================================
--- releng/9.1/usr.sbin/pkg/pkg.c	Mon Sep 10 07:56:59 2012	(r240299)
+++ releng/9.1/usr.sbin/pkg/pkg.c	Mon Sep 10 08:14:58 2012	(r240300)
@@ -425,9 +425,11 @@ main(__unused int argc, char *argv[])
 		 * not tty. Check the environment to see if user has answer
 		 * tucked in there already.
 		 */
-		if (getenv("ALWAYS_ASSUME_YES") == NULL &&
-		    isatty(fileno(stdin))) {
+		if (getenv("ASSUME_ALWAYS_YES") == NULL) {
 			printf("%s", confirmation_message);
+			if (!isatty(fileno(stdin)))
+				exit(EXIT_FAILURE);
+
 			if (pkg_query_yes_no() == 0)
 				exit(EXIT_FAILURE);
 		}