Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Multiple dependency listing are now always fatal
Baptiste Daroussin committed 9 years ago
commit af87443882e30135dbfdc10301efb32e39e160cd
parent b0ea8d3
1 file changed +3 -9
modified libpkg/pkg.c
@@ -631,15 +631,9 @@ pkg_adddep_chain(struct pkg_dep *chain,

	pkg_debug(3, "Pkg: add a new dependency origin: %s, name: %s", origin, name);
	if (kh_contains(pkg_deps, pkg->depshash, name)) {
-
		if (developer_mode) {
-
			pkg_emit_error("%s: duplicate dependency listing: %s, fatal (developer mode)",
-
			    pkg->name, name);
-
			return (NULL);
-
		} else {
-
			pkg_emit_error("%s-%s: duplicate dependency listing: %s, ignoring",
-
			    pkg->name, pkg->version, name);
-
			return (NULL);
-
		}
+
		pkg_emit_error("%s: duplicate dependency listing: %s",
+
		    pkg->name, name);
+
		return (NULL);
	}

	d = xcalloc(1, sizeof(*d));