Fri Feb 27 19:34:12 2009 UTC ()

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.


(joerg)

diff -r1.79 -r1.80 pkgsrc/pkgtools/pkg_install/files/add/perform.c

--- pkgsrc/pkgtools/pkg_install/files/add/perform.c 2009/02/26 12:52:43 1.79
+++ pkgsrc/pkgtools/pkg_install/files/add/perform.c 2009/02/27 19:34:12 1.80

 @@ -1,22 +1,22 @@
-/*	$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
 #include <nbcompat.h>
 #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>
  * Copyright (c) 2005 Dieter Baron <dillo@NetBSD.org>
  * Copyright (c) 2007 Roland Illig <rillig@NetBSD.org>
  * Copyright (c) 2008, 2009 Joerg Sonnenberger <joerg@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
 @@ -891,27 +891,27 @@ run_install_script(struct pkg_task *pkg,
+}
 struct find_conflict_data {
 	const char *pkg;
 	const char *old_pkg;
 	const char *pattern;
 };
 static int
 check_explicit_conflict_iter(const char *cur_pkg, void *cookie)
+{
 	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.",
 	    data->pkg, data->pattern, cur_pkg);
 	return 1;
+}
 static int
 check_explicit_conflict(struct pkg_task *pkg)
+{
 	struct find_conflict_data data;
 	char *installed, *installed_pattern;