d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrap long lines

Browse Source 
Approved by:	bapt
MFC after:	2 days
This commit is contained in:
Bryan Drewery 2013-10-26 03:21:08 +00:00
parent 494571986b
commit 4ff9a7ef08
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/pkg/config.c
View File

@ -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;
}

6
usr.sbin/pkg/pkg.c
View File

@ -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)