Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't warn and abort if a package with the same ${PKGBASE} already exists 

if we're installed a depoted package.
This commit is contained in:
jlam 2004-01-14 23:32:36 +00:00
parent 8ef4267baa
commit 0c45ef07f3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.sbin/pkg_install/add/perform.c
View File

@ -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 <sys/cdefs.h>
#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;

4
usr.sbin/pkg_install/lib/version.h
View File

@ -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_ */