From owner-svn-src-all@FreeBSD.ORG Sat Mar 22 10:48:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 136E6FB0; Sat, 22 Mar 2014 10:48:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F3F28E7B; Sat, 22 Mar 2014 10:48:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2MAm7uw055977; Sat, 22 Mar 2014 10:48:07 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2MAm72k055976; Sat, 22 Mar 2014 10:48:07 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201403221048.s2MAm72k055976@svn.freebsd.org> From: Bryan Drewery Date: Sat, 22 Mar 2014 10:48:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r263625 - stable/9/usr.sbin/pkg X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 22 Mar 2014 10:48:08 -0000 Author: bdrewery Date: Sat Mar 22 10:48:07 2014 New Revision: 263625 URL: http://svnweb.freebsd.org/changeset/base/263625 Log: MFC r263180: Fix ABI from /usr/local/etc/pkg.conf not being respected. Modified: stable/9/usr.sbin/pkg/config.c Directory Properties: stable/9/usr.sbin/pkg/ (props changed) Modified: stable/9/usr.sbin/pkg/config.c ============================================================================== --- stable/9/usr.sbin/pkg/config.c Sat Mar 22 10:47:49 2014 (r263624) +++ stable/9/usr.sbin/pkg/config.c Sat Mar 22 10:48:07 2014 (r263625) @@ -391,6 +391,10 @@ config_parse(ucl_object_t *obj, pkg_conf next); } break; + case PKG_CONFIG_BOOL: + temp_config[i].value = + strdup(ucl_object_toboolean(cur) ? "yes" : "no"); + break; default: /* Normal string value. */ temp_config[i].value = strdup(ucl_object_tostring(cur));