Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Merge branch 'master' of github.com:freebsd/pkg
Alexandre Perrin committed 10 years ago
commit d2b8a36ea7d8424637f4ad884b96f4f215133da6
parent 721e2b0
1 file changed +4 -3
modified libpkg/pkg_config.c
@@ -884,11 +884,12 @@ pkg_ini(const char *path, const char *reposdir, pkg_init_flags flags)
		}
	}

-
	if (path == NULL)
+
	if (path == NULL) {
		path = PREFIX"/etc/pkg.conf";

-
	if (pkg_rootdir != NULL)
-
		asprintf(&rootedpath, "%s/%s", pkg_rootdir, path);
+
		if (pkg_rootdir != NULL)
+
			asprintf(&rootedpath, "%s/%s", pkg_rootdir, path);
+
	}

	p = ucl_parser_new(0);
	ucl_parser_register_variable (p, "ABI", myabi);