Almost final fixes for repodata support
This commit is contained in:
parent
3d6d78539c
commit
019aa970f0
@ -1048,11 +1048,13 @@ int addToSourceHeaderList(struct configTag *ct, int mode, int altrepository) {
|
|||||||
findXMLPropertyByName(package_node, "summary")->children->content);
|
findXMLPropertyByName(package_node, "summary")->children->content);
|
||||||
newheadersourcelist->arch = strdup((char*)
|
newheadersourcelist->arch = strdup((char*)
|
||||||
findXMLPropertyByName(package_node, "arch")->children->content);
|
findXMLPropertyByName(package_node, "arch")->children->content);
|
||||||
// hl->buildarchs = headerGetStringEntry(h, RPMTAG_BUILDARCHS);
|
|
||||||
// hl->excludearch = headerGetStringEntry(h, RPMTAG_EXCLUDEARCH);
|
|
||||||
if (findXMLPropertyByName(package_node, "description")->children) {
|
if (findXMLPropertyByName(package_node, "description")->children) {
|
||||||
newheadersourcelist->description = strdup((char*)
|
newheadersourcelist->description = strdup((char*)
|
||||||
findXMLPropertyByName(package_node, "description")->children->content);
|
findXMLPropertyByName(package_node, "description")->children->content);
|
||||||
|
} else {
|
||||||
|
logmsg(LOG_WARNING, "%s(source, %s): description field is empty",
|
||||||
|
newheadersourcelist->name, ct->tag);
|
||||||
|
newheadersourcelist->description = strdup("");
|
||||||
}
|
}
|
||||||
char* packager = strdup((char*)
|
char* packager = strdup((char*)
|
||||||
findXMLPropertyByName(package_node, "packager")->children->content);
|
findXMLPropertyByName(package_node, "packager")->children->content);
|
||||||
@ -1083,7 +1085,10 @@ int addToSourceHeaderList(struct configTag *ct, int mode, int altrepository) {
|
|||||||
xmlNode *psize = findXMLPropertyByName(package_node, "size");
|
xmlNode *psize = findXMLPropertyByName(package_node, "size");
|
||||||
newheadersourcelist->size = atoi(
|
newheadersourcelist->size = atoi(
|
||||||
(char*)findXMLAttributeByName(psize, "package"));
|
(char*)findXMLAttributeByName(psize, "package"));
|
||||||
//hl->patch = headerGetStringArrayEntry(h, RPMTAG_PATCH, &count);
|
// FIXME: information missing from repodata
|
||||||
|
newheadersourcelist->buildarchs = NULL;
|
||||||
|
newheadersourcelist->excludearch = NULL;
|
||||||
|
newheadersourcelist->patch = NULL;
|
||||||
|
|
||||||
// Requires
|
// Requires
|
||||||
getXMLPackageNFV(findXMLPropertyByName(format, "requires"),
|
getXMLPackageNFV(findXMLPropertyByName(format, "requires"),
|
||||||
@ -1515,6 +1520,10 @@ char* advanceXMLPackageNode(char* prevname, xmlNode **primary_node,
|
|||||||
if (findXMLPropertyByName(primary_node[altidx], "description")->children) {
|
if (findXMLPropertyByName(primary_node[altidx], "description")->children) {
|
||||||
newheaderlist->description = strdup((char*)
|
newheaderlist->description = strdup((char*)
|
||||||
findXMLPropertyByName(primary_node[altidx], "description")->children->content);
|
findXMLPropertyByName(primary_node[altidx], "description")->children->content);
|
||||||
|
} else {
|
||||||
|
logmsg(LOG_WARNING, "%s(%s, %s): description field is empty",
|
||||||
|
newheaderlist->name, newheaderlist->arch, ct->repository[altidx]->tag);
|
||||||
|
newheaderlist->description = strdup("");
|
||||||
}
|
}
|
||||||
xmlNode *format = findXMLPropertyByName(primary_node[altidx], "format");
|
xmlNode *format = findXMLPropertyByName(primary_node[altidx], "format");
|
||||||
newheaderlist->group = strdup((char*)
|
newheaderlist->group = strdup((char*)
|
||||||
|
Loading…
Reference in New Issue
Block a user