From owner-svn-src-all@FreeBSD.ORG Sat Oct 26 03:21:09 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DA94D910; Sat, 26 Oct 2013 03:21:09 +0000 (UTC) (envelope-from bdrewery@FreeBSD.org) 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 AF1D62386; Sat, 26 Oct 2013 03:21:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9Q3L9dI074439; Sat, 26 Oct 2013 03:21:09 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9Q3L9Mw074437; Sat, 26 Oct 2013 03:21:09 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201310260321.r9Q3L9Mw074437@svn.freebsd.org> From: Bryan Drewery Date: Sat, 26 Oct 2013 03:21:09 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r257142 - head/usr.sbin/pkg X-SVN-Group: head 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.14 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, 26 Oct 2013 03:21:09 -0000 Author: bdrewery (ports committer) Date: Sat Oct 26 03:21:08 2013 New Revision: 257142 URL: http://svnweb.freebsd.org/changeset/base/257142 Log: Wrap long lines Approved by: bapt MFC after: 2 days Modified: head/usr.sbin/pkg/config.c head/usr.sbin/pkg/pkg.c Modified: head/usr.sbin/pkg/config.c ============================================================================== --- head/usr.sbin/pkg/config.c Sat Oct 26 01:17:54 2013 (r257141) +++ head/usr.sbin/pkg/config.c Sat Oct 26 03:21:08 2013 (r257142) @@ -548,7 +548,8 @@ config_init(void) if ((fp = fopen(confpath, "r")) == NULL) { if (errno != ENOENT) - err(EXIT_FAILURE, "Unable to open configuration file %s", confpath); + err(EXIT_FAILURE, "Unable to open configuration " + "file %s", confpath); /* no configuration present */ goto finalize; } @@ -561,11 +562,13 @@ config_init(void) if (node != NULL) { if (node->type != YAML_MAPPING_NODE) - warnx("Invalid configuration format, ignoring the configuration file"); + warnx("Invalid configuration format, ignoring the " + "configuration file"); else config_parse(&doc, node); } else { - warnx("Invalid configuration format, ignoring the configuration file"); + warnx("Invalid configuration format, ignoring the " + "configuration file"); } yaml_document_delete(&doc); @@ -574,7 +577,8 @@ config_init(void) finalize: if (c[ABI].val == NULL && c[ABI].value == NULL) { if (pkg_get_myabi(abi, BUFSIZ) != 0) - errx(EXIT_FAILURE, "Failed to determine the system ABI"); + errx(EXIT_FAILURE, "Failed to determine the system " + "ABI"); c[ABI].val = abi; } Modified: head/usr.sbin/pkg/pkg.c ============================================================================== --- head/usr.sbin/pkg/pkg.c Sat Oct 26 01:17:54 2013 (r257141) +++ head/usr.sbin/pkg/pkg.c Sat Oct 26 03:21:08 2013 (r257142) @@ -267,8 +267,10 @@ bootstrap_pkg(void) fetchfail: warnx("Error fetching %s: %s", url, fetchLastErrString); - fprintf(stderr, "A pre-built version of pkg could not be found for your system.\n"); - fprintf(stderr, "Consider changing PACKAGESITE or installing it from ports: 'ports-mgmt/pkg'.\n"); + fprintf(stderr, "A pre-built version of pkg could not be found for " + "your system.\n"); + fprintf(stderr, "Consider changing PACKAGESITE or installing it from " + "ports: 'ports-mgmt/pkg'.\n"); cleanup: if (remote != NULL)