Skip site navigation (1)Skip section navigation (2) 
Date:      Sat, 26 Oct 2013 03:21:09 +0000 (UTC)
From:      Bryan Drewery <bdrewery@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r257142 - head/usr.sbin/pkg
Message-ID:  <201310260321.r9Q3L9Mw074437@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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)

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310260321.r9Q3L9Mw074437>