From 6326329eba224a4fbf94afca91fb038c4c1a7f05 Mon Sep 17 00:00:00 2001 From: frueauf Date: Mon, 20 Apr 1998 08:27:45 +0000 Subject: [PATCH] Don't use "+CONTENTS" direct, use CONTENTS_FNAME instead. --- usr.sbin/pkg_install/add/perform.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index a2d20d3af5cc..a7c3130edf45 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -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 #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)