summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2003-08-23 09:14:43 +0000
committertedu <tedu@openbsd.org>2003-08-23 09:14:43 +0000
commit628e7fbb4f4bb466c8e24122d203144302a463f7 (patch)
tree60bac2e6f4b14af2a10622772e9d89bbbf588b0b
parentunder emacs mode, fix the case when the globbed file and the longest (diff)
downloadwireguard-openbsd-628e7fbb4f4bb466c8e24122d203144302a463f7.tar.xz
wireguard-openbsd-628e7fbb4f4bb466c8e24122d203144302a463f7.zip
oops, if file is not on ftp server with PKG_PATH, check installed too.
should resolve han boetes's problem.
-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;
}