STATE_NAME,
STATE_ARCH,
STATE_VERSION,
+ STATE_SUMMARY,
+ STATE_DESCRIPTION,
+ STATE_CATEGORY,
STATE_PKGFILES,
STATE_DELTARPM,
STATE_DLOCATION,
STATE_ENHANCESENTRY,
STATE_FRESHENS,
STATE_FRESHENSENTRY,
+ STATE_REBOOT,
+ STATE_RESTART,
NUMSTATES
};
{ STATE_PATCH, "name", STATE_NAME, 1 },
{ STATE_PATCH, "arch", STATE_ARCH, 1 },
{ STATE_PATCH, "version", STATE_VERSION, 0 },
+ { STATE_PATCH, "summary", STATE_SUMMARY, 1 },
+ { STATE_PATCH, "description", STATE_DESCRIPTION, 1 },
+ { STATE_PATCH, "category", STATE_CATEGORY, 1 },
+ { STATE_PATCH, "reboot-needed", STATE_REBOOT, 0 },
+ { STATE_PATCH, "package-manager", STATE_RESTART, 0 },
{ STATE_PATCH, "rpm:requires", STATE_REQUIRES, 0 },
{ STATE_PATCH, "rpm:provides", STATE_PROVIDES, 0 },
{ STATE_PATCH, "rpm:requires", STATE_REQUIRES, 0 },
Pool *pool;
Repo *repo;
Repodata *data;
+ unsigned int datanum;
Solvable *solvable;
char *kind;
+ Offset freshens;
unsigned int timestamp;
struct stateswitch *swtab[NUMSTATES];
struct deltarpm delta;
};
-static Id id_timestamp;
-
#if 0
static void
append_str(struct parsedata *pd, const char *s)
return;
pd->depth++;
+ if (!pd->swtab[pd->state])
+ return;
for (sw = pd->swtab[pd->state]; sw->from == pd->state; sw++) /* find name in statetable */
if (!strcmp(sw->ename, name))
break;
if ((str = find_attr("timestamp", atts)))
{
pd->timestamp = strtoul(str, NULL, 10);
- fprintf(stderr, "timestamp %s [%d]\n", str, pd->timestamp);
}
}
/*FALLTHRU*/
pd->kind = "patch";
pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo));
+ pd->freshens = 0;
if (!strcmp(pd->kind, "patch"))
{
- int solvnum = (pd->solvable - pool->solvables) - pd->repo->start;
- if (pd->data)
- repodata_extend(pd->data, pd->solvable - pool->solvables);
- repodata_set_num(pd->data, solvnum, id_timestamp, pd->timestamp);
+ pd->datanum = pd->solvable - pool->solvables;
+ repodata_set_num(pd->data, pd->datanum, SOLVABLE_BUILDTIME, pd->timestamp);
}
#if 0
fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables);
s->enhances = adddep(pool, pd, s->enhances, atts, 0);
break;
case STATE_FRESHENS:
- s->freshens = 0;
+ pd->freshens = 0;
break;
case STATE_FRESHENSENTRY:
- s->freshens = adddep(pool, pd, s->freshens, atts, 0);
- break;
+ pd->freshens = adddep(pool, pd, pd->freshens, atts, 0);
+ break;
+ case STATE_REBOOT:
+ repodata_set_void(pd->data, pd->datanum, UPDATE_REBOOT);
+ break;
+ case STATE_RESTART:
+ repodata_set_void(pd->data, pd->datanum, UPDATE_RESTART);
+ break;
default:
break;
}
s->arch = ARCH_NOARCH;
if (s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
s->provides = repo_addid_dep(pd->repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
- s->supplements = repo_fix_legacy(pd->repo, s->provides, s->supplements);
+ s->supplements = repo_fix_supplements(pd->repo, s->provides, s->supplements, pd->freshens);
+ s->conflicts = repo_fix_conflicts(pd->repo, s->conflicts);
+ pd->freshens = 0;
break;
case STATE_NAME:
s->name = str2id(pool, pd->content, 1);
case STATE_ARCH:
s->arch = str2id(pool, pd->content, 1);
break;
+ case STATE_SUMMARY:
+ repodata_set_str(pd->data, pd->datanum, SOLVABLE_SUMMARY, pd->content);
+ break;
+ case STATE_DESCRIPTION:
+ repodata_set_str(pd->data, pd->datanum, SOLVABLE_DESCRIPTION, pd->content);
+ break;
+ case STATE_CATEGORY:
+ repodata_set_str(pd->data, pd->datanum, SOLVABLE_PATCHCATEGORY, pd->content);
+ break;
case STATE_DELTARPM:
#ifdef TESTMM
{
char buf[BUFF_SIZE];
int i, l;
struct stateswitch *sw;
+ Repodata *data;
+
+ if (!(flags & REPO_REUSE_REPODATA))
+ data = repo_add_repodata(repo, 0);
+ else
+ data = repo_last_repodata(repo);
memset(&pd, 0, sizeof(pd));
for (i = 0, sw = stateswitches; sw->from != NUMSTATES; i++, sw++)
}
pd.pool = pool;
pd.repo = repo;
- pd.data = repo_add_repodata(pd.repo);
- id_timestamp = str2id(pool, "patch:timestamp", 1);
-
+ pd.data = data;
+
pd.content = malloc(256);
pd.acontent = 256;
pd.lcontent = 0;
l = fread(buf, 1, sizeof(buf), fp);
if (XML_Parse(parser, buf, l, l == 0) == XML_STATUS_ERROR)
{
- fprintf(stderr, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
+ pool_debug(pool, SAT_FATAL, "repo_patchxml: %s at line %u:%u\n", XML_ErrorString(XML_GetErrorCode(parser)), (unsigned int)XML_GetCurrentLineNumber(parser), (unsigned int)XML_GetCurrentColumnNumber(parser));
exit(1);
}
if (l == 0)
}
XML_ParserFree(parser);
- if (pd.data)
- repodata_internalize(pd.data);
+ if (!(flags & REPO_NO_INTERNALIZE))
+ repodata_internalize(data);
free(pd.content);
}