Radish alpha
H
HardenedBSD-pkg
HardenedBSD Package Manager
Radicle
Git (anonymous pull)
Log in to clone via SSH
Commits ›
Only show the @dirrm warning once.
Bryan Drewery committed 11 years ago
commit fb304fd0eed5a37422ecef517dc60823090d8976
parent ac5412b66693814829ab53a1180f282ec653fcc1
1 file changed +16 -4
modified libpkg/pkg_ports.c
@@ -293,21 +293,33 @@ dir(struct plist *p, char *line, struct file_attr *a)
	return (meta_dir(p, line, a, true));

}
+ 
static void
+ 
warn_deprecated_dir(void)
+ 
{
+ 
	static bool warned_deprecated_dir = false;
+
+ 
	if (warned_deprecated_dir)
+ 
		return;
+ 
	warned_deprecated_dir = true;
+
+ 
	if (pkg_object_bool(pkg_config_get("DEVELOPER_MODE")))
+ 
		pkg_emit_error("Warning: @dirrm[try] is deprecated, please"
+ 
		    " use @dir");
+ 
}
+ 


static int

dirrm(struct plist *p, char *line, struct file_attr *a)

{
- 
	if (pkg_object_bool(pkg_config_get("DEVELOPER_MODE")))
- 
		pkg_emit_error("Warning: @dirrm is deprecated please use @dir");
+ 
	warn_deprecated_dir();

	return (meta_dir(p, line, a, false));

}



static int

dirrmtry(struct plist *p, char *line, struct file_attr *a)

{
- 
	if (pkg_object_bool(pkg_config_get("DEVELOPER_MODE")))
- 
		pkg_emit_error("Warning: @dirrmtry is deprecated please use @dir");
+ 
	warn_deprecated_dir();

	return (meta_dir(p, line, a, true));

}