Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't use "+CONTENTS" direct, use CONTENTS_FNAME instead.

This commit is contained in:
frueauf 1998-04-20 08:27:45 +00:00
parent 88aa59e1cd
commit 6326329eba
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.sbin/pkg_install/add/perform.c
View File

@ -1,11 +1,11 @@
/* $NetBSD: perform.c,v 1.8 1997/10/18 11:05:38 lukem Exp $ */
/* $NetBSD: perform.c,v 1.9 1998/04/20 08:27:45 frueauf Exp $ */
#include <sys/cdefs.h>
#ifndef lint
#if 0
static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp";
#else
__RCSID("$NetBSD: perform.c,v 1.8 1997/10/18 11:05:38 lukem Exp $");
__RCSID("$NetBSD: perform.c,v 1.9 1998/04/20 08:27:45 frueauf Exp $");
#endif
#endif
@ -264,13 +264,13 @@ pkg_do(char *pkg)
else if ((cp = fileGetURL(pkg, p->name)) != NULL) {
if (Verbose)
printf("Finished loading %s over FTP.\n", p->name);
if (!fexists("+CONTENTS")) {
warnx("autoloaded package %s has no +CONTENTS file?",
p->name);
if (!fexists(CONTENTS_FNAME)) {
warnx("autoloaded package %s has no %s file?",
p->name, CONTENTS_FNAME);
if (!Force)
++code;
}
else if (vsystem("(pwd; cat +CONTENTS) | pkg_add %s-S", Verbose ? "-v " : "")) {
else if (vsystem("(pwd; cat %s) | pkg_add %s-S", CONTENTS_FNAME, Verbose ? "-v " : "")) {
warnx("pkg_add of dependency `%s' failed%s",
p->name, Force ? " (proceeding anyway)" : "!");
if (!Force)