From dee7a26d93c7a9612f71c6b4131977727988ac3c Mon Sep 17 00:00:00 2001 From: joerg Date: Mon, 7 Apr 2008 13:25:32 +0000 Subject: Simplify logic and make pkgdbdir the default for pkg_vulnerabilities_dir. --- pkgtools/pkg_install/files/admin/config.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'pkgtools/pkg_install') diff --git a/pkgtools/pkg_install/files/admin/config.c b/pkgtools/pkg_install/files/admin/config.c index 327cdba11bc..073642fbc10 100644 --- a/pkgtools/pkg_install/files/admin/config.c +++ b/pkgtools/pkg_install/files/admin/config.c @@ -1,4 +1,4 @@ -/* $NetBSD: config.c,v 1.4 2008/04/07 13:07:14 joerg Exp $ */ +/* $NetBSD: config.c,v 1.5 2008/04/07 13:25:32 joerg Exp $ */ #if HAVE_CONFIG_H #include "config.h" @@ -8,7 +8,7 @@ #include #endif #ifndef lint -__RCSID("$NetBSD: config.c,v 1.4 2008/04/07 13:07:14 joerg Exp $"); +__RCSID("$NetBSD: config.c,v 1.5 2008/04/07 13:25:32 joerg Exp $"); #endif /*- @@ -80,10 +80,9 @@ pkg_install_config(const char *config_file) *var->var = value; } - if (pkg_vulnerabilities_dir != NULL) - ret = asprintf(&value, "%s/pkg-vulnerabilities", pkg_vulnerabilities_dir); - else - ret = asprintf(&value, "%s/pkg-vulnerabilities", _pkgdb_getPKGDB_DIR()); + if (pkg_vulnerabilities_dir == NULL) + pkg_vulnerabilities_dir = _pkgdb_getPKGDB_DIR(); + ret = asprintf(&value, "%s/pkg-vulnerabilities", pkg_vulnerabilities_dir); pkg_vulnerabilities_file = value; if (ret == -1) err(EXIT_FAILURE, "asprintf failed"); -- cgit v1.2.3