From c086a7443b1cb28aada67fb8cc532354fd759da8 Mon Sep 17 00:00:00 2001 From: hubertf Date: Mon, 18 May 1998 23:47:23 +0000 Subject: [PATCH] No need to unpack file after fileGetURL(), which already did the work for us; Fixes PR 5456 by "Heiko W.Rupp" --- usr.sbin/pkg_install/info/perform.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/usr.sbin/pkg_install/info/perform.c b/usr.sbin/pkg_install/info/perform.c index 1a9d2d972f89..ebdcf08c7fb5 100644 --- a/usr.sbin/pkg_install/info/perform.c +++ b/usr.sbin/pkg_install/info/perform.c @@ -1,11 +1,11 @@ -/* $NetBSD: perform.c,v 1.4 1997/10/17 14:54:17 lukem Exp $ */ +/* $NetBSD: perform.c,v 1.5 1998/05/18 23:47:23 hubertf Exp $ */ #include #ifndef lint #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.23 1997/10/13 15:03:53 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.4 1997/10/17 14:54:17 lukem Exp $"); +__RCSID("$NetBSD: perform.c,v 1.5 1998/05/18 23:47:23 hubertf Exp $"); #endif #endif @@ -113,6 +113,11 @@ pkg_do(char *pkg) strncpy(fname, cp, FILENAME_MAX); } if (cp) { + if (isURL(pkg)) { + /* file is already unpacked by fileGetURL() */ + strcpy(PlayPen,cp); + } + else { /* * Apply a crude heuristic to see how much space the package will * take up once it's unpacked. I've noticed that most packages @@ -130,6 +135,7 @@ pkg_do(char *pkg) code = 1; goto bail; } + } } /* It's not an ininstalled package, try and find it among the installed */ else {