X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=ext%2Frepo_rpmmd.c;h=a45d491e94f3ab2f876dc8d80bfd3140ddbf0e23;hb=2b7fc13cedc8bb796ac2b7e88f664d1602cf701f;hp=b765e5bd9281f3c5cdb4df8cb433e57d8ad1cdc6;hpb=80b1b49c101767a66712306f963da7f4120acdeb;p=platform%2Fupstream%2Flibsolv.git diff --git a/ext/repo_rpmmd.c b/ext/repo_rpmmd.c index b765e5b..a45d491 100644 --- a/ext/repo_rpmmd.c +++ b/ext/repo_rpmmd.c @@ -19,7 +19,9 @@ #include "tools_util.h" #include "repo_rpmmd.h" #include "chksum.h" - +#ifdef ENABLE_COMPLEX_DEPS +#include "pool_parserpmrichdep.h" +#endif enum state { STATE_START, @@ -78,11 +80,6 @@ enum state { STATE_INSTALL_TIME, /* product */ - STATE_SHORTNAME, - STATE_DISTNAME, /* obsolete */ - STATE_DISTEDITION, /* obsolete */ - STATE_SOURCE, - STATE_TYPE, STATE_RELNOTESURL, STATE_UPDATEURL, STATE_OPTIONALURL, @@ -114,6 +111,8 @@ enum state { STATE_FILE, + STATE_CHANGELOG, + /* general */ NUMSTATES }; @@ -182,27 +181,28 @@ static struct stateswitch stateswitches[] = { /* product attributes */ /* note the product type is an attribute */ { STATE_SOLVABLE, "release-notes-url", STATE_RELNOTESURL, 1 }, - { STATE_SOLVABLE, "update-url", STATE_UPDATEURL, 1 }, - { STATE_SOLVABLE, "optional-url", STATE_OPTIONALURL, 1 }, - { STATE_SOLVABLE, "flag", STATE_FLAG, 1 }, + { STATE_SOLVABLE, "update-url", STATE_UPDATEURL, 1 }, + { STATE_SOLVABLE, "optional-url", STATE_OPTIONALURL, 1 }, + { STATE_SOLVABLE, "flag", STATE_FLAG, 1 }, - { STATE_SOLVABLE, "rpm:vendor", STATE_VENDOR, 1 }, - { STATE_SOLVABLE, "rpm:group", STATE_RPM_GROUP, 1 }, - { STATE_SOLVABLE, "rpm:license", STATE_RPM_LICENSE, 1 }, + { STATE_SOLVABLE, "rpm:vendor", STATE_VENDOR, 1 }, + { STATE_SOLVABLE, "rpm:group", STATE_RPM_GROUP, 1 }, + { STATE_SOLVABLE, "rpm:license", STATE_RPM_LICENSE, 1 }, /* rpm-md dependencies */ - { STATE_SOLVABLE, "rpm:provides", STATE_PROVIDES, 0 }, - { STATE_SOLVABLE, "rpm:requires", STATE_REQUIRES, 0 }, - { STATE_SOLVABLE, "rpm:obsoletes", STATE_OBSOLETES, 0 }, - { STATE_SOLVABLE, "rpm:conflicts", STATE_CONFLICTS, 0 }, - { STATE_SOLVABLE, "rpm:recommends", STATE_RECOMMENDS , 0 }, - { STATE_SOLVABLE, "rpm:supplements", STATE_SUPPLEMENTS, 0 }, - { STATE_SOLVABLE, "rpm:suggests", STATE_SUGGESTS, 0 }, - { STATE_SOLVABLE, "rpm:enhances", STATE_ENHANCES, 0 }, - { STATE_SOLVABLE, "rpm:freshens", STATE_FRESHENS, 0 }, - { STATE_SOLVABLE, "rpm:sourcerpm", STATE_SOURCERPM, 1 }, - { STATE_SOLVABLE, "rpm:header-range", STATE_HEADERRANGE, 0 }, - { STATE_SOLVABLE, "file", STATE_FILE, 1 }, + { STATE_SOLVABLE, "rpm:provides", STATE_PROVIDES, 0 }, + { STATE_SOLVABLE, "rpm:requires", STATE_REQUIRES, 0 }, + { STATE_SOLVABLE, "rpm:obsoletes", STATE_OBSOLETES, 0 }, + { STATE_SOLVABLE, "rpm:conflicts", STATE_CONFLICTS, 0 }, + { STATE_SOLVABLE, "rpm:recommends", STATE_RECOMMENDS , 0 }, + { STATE_SOLVABLE, "rpm:supplements", STATE_SUPPLEMENTS, 0 }, + { STATE_SOLVABLE, "rpm:suggests", STATE_SUGGESTS, 0 }, + { STATE_SOLVABLE, "rpm:enhances", STATE_ENHANCES, 0 }, + { STATE_SOLVABLE, "rpm:freshens", STATE_FRESHENS, 0 }, + { STATE_SOLVABLE, "rpm:sourcerpm", STATE_SOURCERPM, 1 }, + { STATE_SOLVABLE, "rpm:header-range", STATE_HEADERRANGE, 0 }, + { STATE_SOLVABLE, "file", STATE_FILE, 1 }, + { STATE_SOLVABLE, "changelog", STATE_CHANGELOG, 1 }, /* extended Novell/SUSE diskusage attributes (susedata.xml) */ { STATE_DISKUSAGE, "dirs", STATE_DIRS, 0 }, @@ -224,11 +224,6 @@ static struct stateswitch stateswitches[] = { { NUMSTATES} }; -/* maxmum initial size of - the checksum cache */ -#define MAX_CSCACHE 32768 -#define CSREALLOC_STEP 1024 - struct parsedata { int ret; Pool *pool; @@ -261,6 +256,8 @@ struct parsedata { char *lastdirstr; int lastdirstrl; + Id changelog_handle; + /** Hash to maps checksums to solv */ Stringpool cspool; /** Cache of known checksums to solvable id */ @@ -378,7 +375,7 @@ makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) else if (!strcmp(*atts, "rel")) r = atts[1]; } - if (e && !strcmp(e, "0")) + if (e && (!*e || !strcmp(e, "0"))) e = 0; if (v && !e) { @@ -471,7 +468,7 @@ static char *flagtab[] = { static unsigned int adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, const char **atts, int isreq) { - Id id, name, marker; + Id id, marker; const char *n, *f, *k; const char **a; @@ -501,10 +498,18 @@ adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, const char **atts pd->acontent = l + 256; } sprintf(pd->content, "%s:%s", k, n); - name = pool_str2id(pool, pd->content, 1); + id = pool_str2id(pool, pd->content, 1); } +#ifdef ENABLE_COMPLEX_DEPS + else if (!f && n[0] == '(') + { + id = pool_parserpmrichdep(pool, n); + if (!id) + return olddeps; + } +#endif else - name = pool_str2id(pool, (char *)n, 1); + id = pool_str2id(pool, (char *)n, 1); if (f) { Id evr = makeevr_atts(pool, pd, atts); @@ -513,12 +518,10 @@ adddep(Pool *pool, struct parsedata *pd, unsigned int olddeps, const char **atts if (!strcmp(f, flagtab[flags])) break; flags = flags < 6 ? flags + 1 : 0; - id = pool_rel2id(pool, name, evr, flags, 1); + id = pool_rel2id(pool, id, evr, flags, 1); } - else - id = name; #if 0 - fprintf(stderr, "new dep %s%s%s\n", pool_id2str(pool, d), id2rel(pool, d), id2evr(pool, d)); + fprintf(stderr, "new dep %s\n", pool_dep2str(pool, id)); #endif return repo_addid_dep(pd->repo, olddeps, id, marker); } @@ -674,13 +677,20 @@ startElement(void *userData, const char *name, const char **atts) } pd->solvable = pool_id2solvable(pool, pd->cscache[index]); } - else + else { /* this is a new package */ pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); pd->freshens = 0; } - pd->handle = pd->solvable - pool->solvables; + pd->handle = handle = pd->solvable - pool->solvables; + if (pd->kind && pd->kind[1] == 'r') + { + /* products can have a type */ + const char *type = find_attr("type", atts); + if (type && *type) + repodata_set_str(pd->data, handle, PRODUCT_TYPE, type); + } #if 0 fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables); #endif @@ -755,17 +765,32 @@ startElement(void *userData, const char *name, const char **atts) case STATE_INCLUDESENTRY: str = find_attr("pattern", atts); if (str) - repodata_add_poolstr_array(pd->data, pd->handle, SOLVABLE_INCLUDES, join2(&pd->jd, "pattern", ":", str)); + repodata_add_poolstr_array(pd->data, handle, SOLVABLE_INCLUDES, join2(&pd->jd, "pattern", ":", str)); break; case STATE_EXTENDSENTRY: str = find_attr("pattern", atts); if (str) - repodata_add_poolstr_array(pd->data, pd->handle, SOLVABLE_EXTENDS, join2(&pd->jd, "pattern", ":", str)); + repodata_add_poolstr_array(pd->data, handle, SOLVABLE_EXTENDS, join2(&pd->jd, "pattern", ":", str)); break; case STATE_LOCATION: str = find_attr("href", atts); if (str) - repodata_set_location(pd->data, handle, 0, 0, str); + { + int medianr = 0; + const char *base = find_attr("xml:base", atts); + if (base && !strncmp(base, "media:", 6)) + { + /* check for the media number in the fragment */ + int l = strlen(base); + while (l && base[l - 1] >= '0' && base[l - 1] <= '9') + l--; + if (l && base[l - 1] == '#' && base[l]) + medianr = atoi(base + l); + } + repodata_set_location(pd->data, handle, medianr, 0, str); + if (base) + repodata_set_poolstr(pd->data, handle, SOLVABLE_MEDIABASE, base); + } break; case STATE_CHECKSUM: str = find_attr("type", atts); @@ -822,6 +847,8 @@ startElement(void *userData, const char *name, const char **atts) pd->ret = pool_error(pool, -1, " tag without 'name' attribute"); break; } + if (!dirid) + dirid = repodata_str2dir(pd->data, "/", 1); if ((str = find_attr("size", atts)) != 0) filesz = strtol(str, 0, 0); if ((str = find_attr("count", atts)) != 0) @@ -833,6 +860,13 @@ startElement(void *userData, const char *name, const char **atts) pd->ndirs++; break; } + case STATE_CHANGELOG: + pd->changelog_handle = repodata_new_handle(pd->data); + if ((str = find_attr("date", atts)) != 0) + repodata_set_num(pd->data, pd->changelog_handle, SOLVABLE_CHANGELOG_TIME, strtoull(str, 0, 10)); + if ((str = find_attr("author", atts)) != 0) + repodata_set_str(pd->data, pd->changelog_handle, SOLVABLE_CHANGELOG_AUTHOR, str); + break; default: break; } @@ -1007,27 +1041,27 @@ endElement(void *userData, const char *name) case STATE_RELNOTESURL: if (pd->content[0]) { - repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_URL, pd->content); - repodata_add_idarray(pd->data, pd->handle, PRODUCT_URL_TYPE, pool_str2id(pool, "releasenotes", 1)); + repodata_add_poolstr_array(pd->data, handle, PRODUCT_URL, pd->content); + repodata_add_idarray(pd->data, handle, PRODUCT_URL_TYPE, pool_str2id(pool, "releasenotes", 1)); } break; case STATE_UPDATEURL: if (pd->content[0]) { - repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_URL, pd->content); - repodata_add_idarray(pd->data, pd->handle, PRODUCT_URL_TYPE, pool_str2id(pool, "update", 1)); + repodata_add_poolstr_array(pd->data, handle, PRODUCT_URL, pd->content); + repodata_add_idarray(pd->data, handle, PRODUCT_URL_TYPE, pool_str2id(pool, "update", 1)); } break; case STATE_OPTIONALURL: if (pd->content[0]) { - repodata_add_poolstr_array(pd->data, pd->handle, PRODUCT_URL, pd->content); - repodata_add_idarray(pd->data, pd->handle, PRODUCT_URL_TYPE, pool_str2id(pool, "optional", 1)); + repodata_add_poolstr_array(pd->data, handle, PRODUCT_URL, pd->content); + repodata_add_idarray(pd->data, handle, PRODUCT_URL_TYPE, pool_str2id(pool, "optional", 1)); } break; case STATE_FLAG: if (pd->content[0]) - repodata_set_poolstr(pd->data, handle, PRODUCT_FLAGS, pd->content); + repodata_add_poolstr_array(pd->data, handle, PRODUCT_FLAGS, pd->content); break; case STATE_EULA: if (pd->content[0]) @@ -1035,15 +1069,21 @@ endElement(void *userData, const char *name) break; case STATE_KEYWORD: if (pd->content[0]) - repodata_add_poolstr_array(pd->data, pd->handle, SOLVABLE_KEYWORDS, pd->content); + repodata_add_poolstr_array(pd->data, handle, SOLVABLE_KEYWORDS, pd->content); break; case STATE_DISKUSAGE: if (pd->ndirs) - commit_diskusage(pd, pd->handle); + commit_diskusage(pd, handle); break; case STATE_ORDER: if (pd->content[0]) - repodata_set_str(pd->data, pd->handle, SOLVABLE_ORDER, pd->content); + repodata_set_str(pd->data, handle, SOLVABLE_ORDER, pd->content); + break; + case STATE_CHANGELOG: + repodata_set_str(pd->data, pd->changelog_handle, SOLVABLE_CHANGELOG_TEXT, pd->content); + repodata_add_flexarray(pd->data, handle, SOLVABLE_CHANGELOG, pd->changelog_handle); + pd->changelog_handle = 0; + break; default: break; }