summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-08-23 09:14:44 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-08-23 09:14:44 +0000
commit918c3d0804ac84acdad346f404765a73c420f153 (patch)
tree75ba7e5b7e6fa76eae72be2c69580fb1e929b715 /usr.sbin
parent468a6c036dfa96474a434f7baf36a64ff59392c8 (diff)
oops, if file is not on ftp server with PKG_PATH, check installed too.
should resolve han boetes's problem.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/pkg_install/info/perform.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c
index ea1983fdfca..5a96258a779 100644
--- a/usr.sbin/pkg_install/info/perform.c
+++ b/usr.sbin/pkg_install/info/perform.c
@@ -1,7 +1,7 @@
-/* $OpenBSD: perform.c,v 1.15 2003/08/18 16:56:02 tedu Exp $ */
+/* $OpenBSD: perform.c,v 1.16 2003/08/23 09:14:43 tedu Exp $ */
#ifndef lint
-static const char rcsid[] = "$OpenBSD: perform.c,v 1.15 2003/08/18 16:56:02 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: perform.c,v 1.16 2003/08/23 09:14:43 tedu Exp $";
#endif
/* This is OpenBSD pkg_install, based on:
@@ -189,6 +189,8 @@ installed:
fp = fopen(CONTENTS_FNAME, "r");
if (!fp) {
pwarnx("unable to open %s file", CONTENTS_FNAME);
+ if (isurl) /* file not on server, check installed */
+ goto installed;
code = 1;
goto bail;
}