summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install/lib
diff options
context:
space:
mode:
authoreadler <eadler@FreeBSD.org>2012-11-26 05:11:07 +0000
committereadler <eadler@FreeBSD.org>2012-11-26 05:11:07 +0000
commitead7f1f7d0b49646e2d3dab460cbf3b99b228dfe (patch)
tree08b6aedd65e7d90f2b61e0dfe19477ec455df6de /usr.sbin/pkg_install/lib
parent7bec6c5d6838f84a8e0ddc0b8c227958f254172a (diff)
downloadFreeBSD-src-ead7f1f7d0b49646e2d3dab460cbf3b99b228dfe.zip
FreeBSD-src-ead7f1f7d0b49646e2d3dab460cbf3b99b228dfe.tar.gz
Provide an option to users to shoot themselves in the foot.
Reviewed by: bapt Approved by: cperciva MFC after: 1 month
Diffstat (limited to 'usr.sbin/pkg_install/lib')
-rw-r--r--usr.sbin/pkg_install/lib/lib.h2
-rw-r--r--usr.sbin/pkg_install/lib/pkgng.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index a96214b..aebcc0b 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -99,7 +99,7 @@
* Version of the package tools - increase whenever you make a change
* in the code that is not cosmetic only.
*/
-#define PKG_INSTALL_VERSION 20121024
+#define PKG_INSTALL_VERSION 20121109
#define PKG_WRAPCONF_FNAME "/var/db/pkg_install.conf"
#define main(argc, argv) real_main(argc, argv)
diff --git a/usr.sbin/pkg_install/lib/pkgng.c b/usr.sbin/pkg_install/lib/pkgng.c
index d9eae2f..a8731c7 100644
--- a/usr.sbin/pkg_install/lib/pkgng.c
+++ b/usr.sbin/pkg_install/lib/pkgng.c
@@ -40,7 +40,11 @@ void warnpkgng(void)
{
char pkgngpath[MAXPATHLEN];
char *pkgngdir;
+ char *dontwarn;
+ dontwarn = getenv("PKG_OLD_NOWARN");
+ if (dontwarn != NULL)
+ return;
pkgngdir = getenv("PKG_DBDIR");
if (pkgngdir == NULL)
pkgngdir = "/var/db/pkg";
OpenPOWER on IntegriCloud