diff options
| author | hubertf <hubertf> | 2005-07-18 09:14:04 +0000 |
|---|---|---|
| committer | hubertf <hubertf> | 2005-07-18 09:14:04 +0000 |
| commit | beceb7ccef3913979702127df09fbeb16a3844bb (patch) | |
| tree | b1472cb3329f2eedb3b89e646376a429edc6aa2e /pkgtools/pkg_install | |
| parent | 1c9c0fbac3ce26b5ee0d9a267701b3f7799beae4 (diff) | |
| download | pkgsrc-beceb7ccef3913979702127df09fbeb16a3844bb.tar.gz | |
Sync over files from src/usr.sbin/pkg_install to fix PR pkg/30658:
Warn, but don't error out on pkgs that were built with IGNORE_RECOMMENDED.
Bump version to 20050718.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/files/add/perform.c | 17 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/add/pkg_add.1 | 11 | ||||
| -rw-r--r-- | pkgtools/pkg_install/files/lib/version.h | 4 |
3 files changed, 9 insertions, 23 deletions
diff --git a/pkgtools/pkg_install/files/add/perform.c b/pkgtools/pkg_install/files/add/perform.c index 4a0f11bf7f1..10613adddfb 100644 --- a/pkgtools/pkg_install/files/add/perform.c +++ b/pkgtools/pkg_install/files/add/perform.c @@ -1,4 +1,4 @@ -/* $NetBSD: perform.c,v 1.31 2005/06/10 01:37:21 dmcmahill Exp $ */ +/* $NetBSD: perform.c,v 1.32 2005/07/18 09:14:04 hubertf Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -11,7 +11,7 @@ #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.31 2005/06/10 01:37:21 dmcmahill Exp $"); +__RCSID("$NetBSD: perform.c,v 1.32 2005/07/18 09:14:04 hubertf Exp $"); #endif #endif @@ -446,17 +446,8 @@ pkg_do(const char *pkg, lpkg_head_t *pkgs) if (buildinfo[BI_IGNORE_RECOMMENDED] != NULL && strcasecmp(buildinfo[BI_IGNORE_RECOMMENDED], "NO") != 0) { - warnx("Package `%s' has", pkg); - warnx("IGNORE_RECOMMENDED set: This package was built with"); - warnx("dependency recommendations ignored. It may have been"); - warnx("built against a set of installed packages that is"); - warnx("different from the recommended set of pre-requisites."); - warnx("As a consequence, this package may not work on this"); - warnx("or other systems with a different set of packages."); - if (!Force && !getenv("PKG_IGNORE_RECOMMENDED")) { - warnx("aborting."); - goto bomb; - } + warnx("%s was built", pkg); + warnx("\t to ignore recommended dependencies, this may cause problems!\n"); } /* diff --git a/pkgtools/pkg_install/files/add/pkg_add.1 b/pkgtools/pkg_install/files/add/pkg_add.1 index 4e34115a579..93e354d11d1 100644 --- a/pkgtools/pkg_install/files/add/pkg_add.1 +++ b/pkgtools/pkg_install/files/add/pkg_add.1 @@ -1,4 +1,4 @@ -.\" $NetBSD: pkg_add.1,v 1.14 2005/05/06 23:03:41 wiz Exp $ +.\" $NetBSD: pkg_add.1,v 1.15 2005/07/18 09:14:04 hubertf Exp $ .\" .\" FreeBSD install - a package for the installation and maintenance .\" of non-core utilities. @@ -17,7 +17,7 @@ .\" .\" @(#)pkg_add.1 .\" -.Dd May 7, 2005 +.Dd July 13, 2005 .Dt PKG_ADD 1 .Os .Sh NAME @@ -401,12 +401,7 @@ The package build information from is then checked for .Ev IGNORE_RECOMMENDED . If the package was built with dependency recommendations ignored, -installation will be aborted. -This behavior is overridable with the -.Fl f -flag and the -.Ev PKG_IGNORE_RECOMMENDED -environment variable. +a warning will be issued. .It If the package contains a .Ar require diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h index c9e25888644..75f6bfb2a71 100644 --- a/pkgtools/pkg_install/files/lib/version.h +++ b/pkgtools/pkg_install/files/lib/version.h @@ -1,4 +1,4 @@ -/* $NetBSD: version.h,v 1.46 2005/06/10 01:37:21 dmcmahill Exp $ */ +/* $NetBSD: version.h,v 1.47 2005/07/18 09:14:04 hubertf 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 "20050607" +#define PKGTOOLS_VERSION "20050718" #endif /* _INST_LIB_VERSION_H_ */ |