Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 0054cab
Retain lstat() warning in DEVELOPER_MODE but make it non-fatal
Bryan Drewery committed 13 years ago
commit 0054cab616e96901da8f99534ba6e5a4392eeb5b
parent 2ee2f50
1 file changed +12 -9
modified libpkg/pkg_ports.c
@@ -163,16 +163,19 @@ meta_dirrm(struct plist *p, char *line, bool try)
		return (pkg_adddir_attr(p->pkg, path, p->uname, p->gname,

		    p->perm, try, true));
- 
	/* If just trying, don't emit errors */
- 
	if (try)
- 
		return (EPKG_OK);
-
- 
	pkg_emit_errno("lstat", path);
- 
	if (p->stage != NULL)
- 
		return (EPKG_FATAL);

	pkg_config_bool(PKG_CONFIG_DEVELOPER_MODE, &developer);
- 
	if (developer)
- 
		return (EPKG_FATAL);
+
+ 
	/* 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)
+ 
			return (EPKG_FATAL);
+ 
	}

	return (EPKG_OK);

}