[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/info Pull over v1.68 from s...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/48dc506d681d
branches:  trunk
changeset: 510780:48dc506d681d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 04 06:28:22 2006 +0000

description:
Pull over v1.68 from src/usr.sbin:
revision 1.68
date: 2006/03/17 02:31:44;  author: hubertf;  state: Exp;  lines: +4 -3
pkg_do(): only use cp2 if it's really set to something useful

Coverity CID 1176

diffstat:

 pkgtools/pkg_install/files/info/perform.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 1bf90b2af4d8 -r 48dc506d681d pkgtools/pkg_install/files/info/perform.c
--- a/pkgtools/pkg_install/files/info/perform.c Tue Apr 04 06:27:13 2006 +0000
+++ b/pkgtools/pkg_install/files/info/perform.c Tue Apr 04 06:28:22 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.26 2005/11/22 15:44:59 ben Exp $ */
+/*     $NetBSD: perform.c,v 1.27 2006/04/04 06:28:22 wiz Exp $ */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -14,7 +14,7 @@
 #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.26 2005/11/22 15:44:59 ben Exp $");
+__RCSID("$NetBSD: perform.c,v 1.27 2006/04/04 06:28:22 wiz Exp $");
 #endif
 #endif
 
@@ -112,8 +112,9 @@
                                if ((cp2 = fileGetURL(cp)) != NULL) {
                                        strlcpy(fname, cp2, sizeof(fname));
                                        isTMP = TRUE;
+                                       
+                                       strcpy(PlayPen, cp2);
                                }
-                               strcpy(PlayPen, cp2);
                        } else {
                                /*
                                 * Apply a crude heuristic to see how much space the package will