Commit e4bdf3d7 authored by Baptiste Daroussin's avatar Baptiste Daroussin
Browse files

plist: remove support for @ignore

parent 81f3bc49
Changes from 1.16.99.3 to 1.16.99.4
- expose the name of the packages to its scripts lua and shell
- remove internal support for @*exec
- remove support for @ignore
Changes from 1.16.99.2 to 1.16.99.3
- lua update to 5.4.2
......
......@@ -64,7 +64,6 @@ static int file(struct plist *, char *, struct file_attr *);
static int setmod(struct plist *, char *, struct file_attr *);
static int setowner(struct plist *, char *, struct file_attr *);
static int setgroup(struct plist *, char *, struct file_attr *);
static int ignore_next(struct plist *, char *, struct file_attr *);
static int comment_key(struct plist *, char *, struct file_attr *);
static int config(struct plist *, char *, struct file_attr *);
/* compat with old packages */
......@@ -86,7 +85,6 @@ static struct action_cmd {
{ "setowner", setowner, 8 },
{ "setgroup", setgroup, 8 },
{ "comment", comment_key, 7 },
{ "ignore_next", ignore_next, 11 },
{ "config", config, 6 },
/* compat with old packages */
{ "name", name_key, 4 },
......@@ -526,16 +524,6 @@ comment_key(struct plist *p, char *line, struct file_attr *a __unused)
return (EPKG_OK);
}
static int
ignore_next(struct plist *p, __unused char *line, struct file_attr *a __unused)
{
p->ignore_next = true;
if (ctx.developer_mode)
pkg_emit_error("Warning: @ignore is deprecated");
return (EPKG_OK);
}
static void
parse_post(struct plist *p)
{
......@@ -580,7 +568,6 @@ static struct keyact {
int (*action)(struct plist *, char *, struct file_attr *);
} keyacts[] = {
{ "cwd", setprefix },
{ "ignore", ignore_next },
{ "comment", comment_key },
{ "config", config },
{ "dir", dir },
......@@ -1090,11 +1077,6 @@ plist_parse_line(struct plist *plist, char *line)
char *keyword, *buf, *bkpline;
struct file_attr *a;
if (plist->ignore_next) {
plist->ignore_next = false;
return (EPKG_OK);
}
if (line[0] == '\0')
return (EPKG_OK);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment