diff --git a/usr.sbin/pkg_install/add/perform.c b/usr.sbin/pkg_install/add/perform.c index 7b44e4b6da42..436a286d430f 100644 --- a/usr.sbin/pkg_install/add/perform.c +++ b/usr.sbin/pkg_install/add/perform.c @@ -1,11 +1,11 @@ -/* $NetBSD: perform.c,v 1.93 2004/01/13 08:30:34 grant Exp $ */ +/* $NetBSD: perform.c,v 1.94 2004/01/14 23:32:36 jlam Exp $ */ #include #ifndef lint #if 0 static const char *rcsid = "from FreeBSD Id: perform.c,v 1.44 1997/10/13 15:03:46 jkh Exp"; #else -__RCSID("$NetBSD: perform.c,v 1.93 2004/01/13 08:30:34 grant Exp $"); +__RCSID("$NetBSD: perform.c,v 1.94 2004/01/14 23:32:36 jlam Exp $"); #endif #endif @@ -494,7 +494,7 @@ ignore_replace_depends_check: installed); } fexec(BINDIR "/pkg_delete", "-K", dbdir, installed, NULL); - } else { + } else if (!is_depoted_pkg) { warnx("other version '%s' already installed", installed); errc = 1; diff --git a/usr.sbin/pkg_install/lib/version.h b/usr.sbin/pkg_install/lib/version.h index fec5d6a62236..3fceb9bbced6 100644 --- a/usr.sbin/pkg_install/lib/version.h +++ b/usr.sbin/pkg_install/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.42 2004/01/13 08:30:34 grant Exp $ */ +/* $NetBSD: version.h,v 1.43 2004/01/14 23:32:37 jlam Exp $ */ /* * Copyright (c) 2001 Thomas Klausner. All rights reserved. @@ -33,6 +33,6 @@ #ifndef _INST_LIB_VERSION_H_ #define _INST_LIB_VERSION_H_ -#define PKGTOOLS_VERSION "20040113" +#define PKGTOOLS_VERSION "20040114" #endif /* _INST_LIB_VERSION_H_ */