Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7305c8f
Add @dir keyword and mark @dirrm and @dirrmtry as deprecated
Baptiste Daroussin committed 11 years ago
commit 7305c8f1063b14ed4be455cdb34d23e35b09a65d
parent 0b7aa4a
1 file changed +17 -0
modified libpkg/pkg_ports.c
@@ -94,6 +94,9 @@ struct action {
};



static int setprefix(struct plist *, char *, struct file_attr *);
+ 
static int dir(struct plist *, char *, struct file_attr *);
+ 
static int dirrm(struct plist *, char *, struct file_attr *);
+ 
static int dirrmtry(struct plist *, char *, struct file_attr *);

static int dirrm(struct plist *, char *, struct file_attr *);

static int dirrmtry(struct plist *, char *, struct file_attr *);

static int file(struct plist *, char *, struct file_attr *);
@@ -114,6 +117,7 @@ static struct action_cmd {
	{ "setprefix", setprefix, 9},

	{ "dirrm", dirrm, 5 },

	{ "dirrmtry", dirrmtry, 7 },
+ 
	{ "dir", dir, 3 },

	{ "file", file, 4 },

	{ "setmode", setmod, 6 },

	{ "setowner", setowner, 8 },
@@ -330,14 +334,26 @@ meta_dirrm(struct plist *p, char *line, struct file_attr *a, bool try)
}



static int
+ 
dir(struct plist *p, char *line, struct file_attr *a)
+ 
{
+ 
	return (meta_dirrm(p, line, a, true));
+ 
}
+
+ 
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");
+ 


	return (meta_dirrm(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: @dirrm is deprecated please use @dir");
+ 


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

}
@@ -694,6 +710,7 @@ static struct keyact {
	{ "cwd", setprefix },

	{ "ignore", ignore_next },

	{ "comment", comment_key },
+ 
	{ "dir", dir },

	{ "dirrm", dirrm },

	{ "dirrmtry", dirrmtry },

	{ "mode", setmod },