From owner-svn-src-head@FreeBSD.ORG  Tue Jul  9 22:01:05 2013
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id E87D6236;
 Tue,  9 Jul 2013 22:01:05 +0000 (UTC)
 (envelope-from dteske@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 DB0781F91;
 Tue,  9 Jul 2013 22:01:05 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r69M15hO061654;
 Tue, 9 Jul 2013 22:01:05 GMT (envelope-from dteske@svn.freebsd.org)
Received: (from dteske@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r69M1554061653;
 Tue, 9 Jul 2013 22:01:05 GMT (envelope-from dteske@svn.freebsd.org)
Message-Id: <201307092201.r69M1554061653@svn.freebsd.org>
From: Devin Teske <dteske@FreeBSD.org>
Date: Tue, 9 Jul 2013 22:01:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r253118 - head/usr.sbin/bsdconfig/share
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: Tue, 09 Jul 2013 22:01:06 -0000

Author: dteske
Date: Tue Jul  9 22:01:05 2013
New Revision: 253118
URL: http://svnweb.freebsd.org/changeset/base/253118

Log:
  Fix conditional (der should match the comment above it).
  
  MFC after:	1 day

Modified:
  head/usr.sbin/bsdconfig/share/dialog.subr

Modified: head/usr.sbin/bsdconfig/share/dialog.subr
==============================================================================
--- head/usr.sbin/bsdconfig/share/dialog.subr	Tue Jul  9 21:53:57 2013	(r253117)
+++ head/usr.sbin/bsdconfig/share/dialog.subr	Tue Jul  9 22:01:05 2013	(r253118)
@@ -2090,7 +2090,7 @@ f_dialog_init()
 	#
 	# Read ~/.dialogrc (unless using Xdialog(1)) for properties
 	#
-	if [ -f ~/.dialogrc ]; then
+	if [ -f ~/.dialogrc -a ! "$USE_XDIALOG" ]; then
 		eval "$(
 			awk -v param=use_shadow -v expect=OFF \
 			    -v set="NO_SHADOW=1" '