[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install/files/add When checking for expli...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ed3ce72aaa7d
branches:  trunk
changeset: 555325:ed3ce72aaa7d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Feb 27 19:34:12 2009 +0000

description:
When checking for explicit conflicts, skip the old version checkif no
old version exists (e.g. because this is not an update).
Reported by Thomas Klausner.

diffstat:

 pkgtools/pkg_install/files/add/perform.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 07c8095cb0ca -r ed3ce72aaa7d pkgtools/pkg_install/files/add/perform.c
--- a/pkgtools/pkg_install/files/add/perform.c  Fri Feb 27 18:41:23 2009 +0000
+++ b/pkgtools/pkg_install/files/add/perform.c  Fri Feb 27 19:34:12 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: perform.c,v 1.79 2009/02/26 12:52:43 joerg Exp $       */
+/*     $NetBSD: perform.c,v 1.80 2009/02/27 19:34:12 joerg Exp $       */
 #if HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -6,7 +6,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: perform.c,v 1.79 2009/02/26 12:52:43 joerg Exp $");
+__RCSID("$NetBSD: perform.c,v 1.80 2009/02/27 19:34:12 joerg Exp $");
 
 /*-
  * Copyright (c) 2003 Grant Beattie <grant%NetBSD.org@localhost>
@@ -901,7 +901,7 @@
 {
        struct find_conflict_data *data = cookie;
 
-       if (strcmp(data->old_pkg, cur_pkg) == 0)
+       if (data->old_pkg && strcmp(data->old_pkg, cur_pkg) == 0)
                return 0;
 
        warnx("Package `%s' conflicts with `%s', and `%s' is installed.",