67b68fb Revert to previous behavior of @dirrmty — HardenedBSD-pkg

HardenedBSD Package Manager

Revert to previous behavior of @dirrmty

Bryan Drewery committed 13 years ago

commit 67b68fbab3f623869f98ad5644807ee6dbbc1c6c
parent 7272cf76f159b0ce4172ed67049b6b9eaaa62c1e

1 file changed +7 -12

modified libpkg/pkg_ports.c

@@ -167,18 +167,13 @@ meta_dirrm(struct plist *p, char *line, bool try)

 	pkg_config_bool(PKG_CONFIG_DEVELOPER_MODE, &developer);
 	/* Only omit warning if not @dirrmtry, or always show in DEVELOPER_MODE */
 	if (!try || developer)
 		pkg_emit_errno("lstat", path);
 	/* Don't emit fatal if using @dirrmtry, regardless of DEVELOPER_MODE or staging */
 	if (!try) {
 		if (p->stage != NULL)
 			return (EPKG_FATAL);
 		if (developer) {
 			pkg_emit_developer_mode("Plist error: @dirrm %s", line);
 			return (EPKG_FATAL);
 		}
 	pkg_emit_errno("lstat", path);
 	if (p->stage != NULL)
 		return (EPKG_FATAL);
 	if (developer) {
 		pkg_emit_developer_mode("Plist error: @dirrm %s", line);
 		return (EPKG_FATAL);
 	}
 	return (EPKG_OK);
 }