January 2008 - Zypp Commits - openSUSE Mailing Lists

[zypp-commit] r8428 - in /trunk/sat-solver/tools: TODO repo_rpmmd.c repo_utils.h tools_util.h
by dmacvicar＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: dmacvicar Date: Thu Jan 31 18:54:12 2008 New Revision: 8428 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8428&view=rev Log: xml store capabilities are parsed now. next: attributes Added: trunk/sat-solver/tools/TODO trunk/sat-solver/tools/tools_util.h - copied, changed from r8427, trunk/sat-solver/tools/repo_utils.h Removed: trunk/sat-solver/tools/repo_utils.h Modified: trunk/sat-solver/tools/repo_rpmmd.c Added: trunk/sat-solver/tools/TODO URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/TODO?rev=8428&v… ============================================================================== --- trunk/sat-solver/tools/TODO (added) +++ trunk/sat-solver/tools/TODO Thu Jan 31 18:54:12 2008 @@ -0,0 +1,4 @@ +dmacvicar TODO + +- xml metadata: prereq for store + Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Thu Jan 31 18:54:12 2008 @@ -15,7 +15,7 @@ #include "pool.h" #include "repo.h" -#include "repo_utils.h" +#include "tools_util.h" #include "repo_rpmmd.h" @@ -29,38 +29,63 @@ STATE_NAME, STATE_ARCH, STATE_VERSION, + + STATE_SUMMARY, + STATE_DESCRIPTION, + STATE_FORMAT, STATE_VENDOR, STATE_PROVIDES, - STATE_PROVIDESENTRY, - STATE_PROVIDESCAP, STATE_REQUIRES, - STATE_REQUIRESENTRY, - STATE_REQUIRESCAP, STATE_OBSOLETES, - STATE_OBSOLETESENTRY, - STATE_OBSOLETESCAP, STATE_CONFLICTS, - STATE_CONFLICTSENTRY, - STATE_CONFLICTSCAP, STATE_RECOMMENDS, - STATE_RECOMMENDSENTRY, - STATE_RECOMMENDSCAP, STATE_SUPPLEMENTS, - STATE_SUPPLEMENTSENTRY, - STATE_SUPPLEMENTSCAP, STATE_SUGGESTS, - STATE_SUGGESTSENTRY, - STATE_SUGGESTSCAP, STATE_ENHANCES, - STATE_ENHANCESENTRY, - STATE_ENHANCESCAP, STATE_FRESHENS, + + STATE_CAPS_FORMAT, + STATE_CAPS_VENDOR, + STATE_CAPS_PROVIDES, + STATE_CAPS_REQUIRES, + STATE_CAPS_OBSOLETES, + STATE_CAPS_CONFLICTS, + STATE_CAPS_RECOMMENDS, + STATE_CAPS_SUPPLEMENTS, + STATE_CAPS_SUGGESTS, + STATE_CAPS_ENHANCES, + STATE_CAPS_FRESHENS, + + STATE_PROVIDESENTRY, + STATE_REQUIRESENTRY, + STATE_OBSOLETESENTRY, + STATE_CONFLICTSENTRY, + STATE_RECOMMENDSENTRY, + STATE_SUPPLEMENTSENTRY, + STATE_SUGGESTSENTRY, + STATE_ENHANCESENTRY, STATE_FRESHENSENTRY, - STATE_FRESHENSCAP, + + STATE_CAP_FRESHENS, + STATE_CAP_PROVIDES, + STATE_CAP_REQUIRES, + STATE_CAP_OBSOLETES, + STATE_CAP_CONFLICTS, + STATE_CAP_SUGGESTS, + STATE_CAP_RECOMMENDS, + STATE_CAP_SUPPLEMENTS, + STATE_CAP_ENHANCES, + STATE_FILE, - STATE_SUMMARY, - STATE_DESCRIPTION, + // xml store pattern attributes + STATE_SCRIPT, + STATE_ICON, + STATE_USERVISIBLE, + STATE_CATEGORY, + STATE_DEFAULT, + STATE_INSTALL_TIME, + NUMSTATES }; @@ -86,32 +111,40 @@ { STATE_SOLVABLE, "version", STATE_VERSION, 0 }, { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, + { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, + { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, + + // xml store pattern attributes + { STATE_SOLVABLE, "script", STATE_SCRIPT, 1 }, + { STATE_SOLVABLE, "icon", STATE_ICON, 1 }, + { STATE_SOLVABLE, "uservisible", STATE_USERVISIBLE, 1 }, + { STATE_SOLVABLE, "category", STATE_CATEGORY, 1 }, + { STATE_SOLVABLE, "default", STATE_DEFAULT, 1 }, + { STATE_SOLVABLE, "install-time", STATE_INSTALL_TIME, 1 }, + { STATE_SOLVABLE, "format", STATE_FORMAT, 0 }, /* those are used in libzypp xml store */ - { STATE_SOLVABLE, "provides", STATE_PROVIDES, 0 }, - { STATE_SOLVABLE, "requires", STATE_REQUIRES, 0 }, - { STATE_SOLVABLE, "obsoletes", STATE_OBSOLETES , 0 }, - { STATE_SOLVABLE, "conflicts", STATE_CONFLICTS , 0 }, - { STATE_SOLVABLE, "recommends", STATE_RECOMMENDS , 0 }, - { STATE_SOLVABLE, "supplements", STATE_SUPPLEMENTS, 0 }, - { STATE_SOLVABLE, "suggests", STATE_SUGGESTS, 0 }, - { STATE_SOLVABLE, "enhances", STATE_ENHANCES, 0 }, - { STATE_SOLVABLE, "freshens", STATE_FRESHENS, 0 }, - - { STATE_PROVIDES, "capability", STATE_PROVIDESCAP, 1 }, - { STATE_REQUIRES, "capability", STATE_REQUIRESCAP, 1 }, - { STATE_OBSOLETES, "capability", STATE_OBSOLETESCAP, 1 }, - { STATE_CONFLICTS, "capability", STATE_CONFLICTSCAP, 1 }, - { STATE_RECOMMENDS, "capability", STATE_RECOMMENDSCAP, 1 }, - { STATE_SUPPLEMENTS, "capability", STATE_SUPPLEMENTSCAP, 1 }, - { STATE_SUGGESTS, "capability", STATE_SUGGESTSCAP, 1 }, - { STATE_ENHANCES, "capability", STATE_ENHANCESCAP, 1 }, - { STATE_FRESHENS, "capability", STATE_FRESHENSCAP, 1 }, + { STATE_SOLVABLE, "obsoletes", STATE_CAPS_OBSOLETES , 0 }, + { STATE_SOLVABLE, "conflicts", STATE_CAPS_CONFLICTS , 0 }, + { STATE_SOLVABLE, "recommends", STATE_CAPS_RECOMMENDS , 0 }, + { STATE_SOLVABLE, "supplements", STATE_CAPS_SUPPLEMENTS, 0 }, + { STATE_SOLVABLE, "suggests", STATE_CAPS_SUGGESTS, 0 }, + { STATE_SOLVABLE, "enhances", STATE_CAPS_ENHANCES, 0 }, + { STATE_SOLVABLE, "freshens", STATE_CAPS_FRESHENS, 0 }, + { STATE_SOLVABLE, "provides", STATE_CAPS_PROVIDES, 0 }, + { STATE_SOLVABLE, "requires", STATE_CAPS_REQUIRES, 0 }, + + { STATE_CAPS_PROVIDES, "capability", STATE_CAP_PROVIDES, 1 }, + { STATE_CAPS_REQUIRES, "capability", STATE_CAP_REQUIRES, 1 }, + { STATE_CAPS_OBSOLETES, "capability", STATE_CAP_OBSOLETES, 1 }, + { STATE_CAPS_CONFLICTS, "capability", STATE_CAP_CONFLICTS, 1 }, + { STATE_CAPS_RECOMMENDS, "capability", STATE_CAP_RECOMMENDS, 1 }, + { STATE_CAPS_SUPPLEMENTS, "capability", STATE_CAP_SUPPLEMENTS, 1 }, + { STATE_CAPS_SUGGESTS, "capability", STATE_CAP_SUGGESTS, 1 }, + { STATE_CAPS_ENHANCES, "capability", STATE_CAP_ENHANCES, 1 }, + { STATE_CAPS_FRESHENS, "capability", STATE_CAP_FRESHENS, 1 }, - { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, - { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, - { STATE_FORMAT, "rpm:vendor", STATE_VENDOR, 1 }, /* rpm-md dependencies */ @@ -162,7 +195,6 @@ "<", "!=", "<=", - "==" }; /** @@ -170,13 +202,13 @@ * which are used in libzypp xml store, not in rpm-md. */ static unsigned int -adddepplain(Pool *pool, struct parsedata_common *pd, unsigned int olddeps, char *line, Id marker, char *kind) +adddepplain(Pool *pool, struct parsedata_common *pd, unsigned int olddeps, char *line, Id marker, const char *kind) { int i, flags; Id id, evrid; char *sp[4]; - i = split(line + 5, sp, 4); + i = split(line, sp, 4); if (i != 1 && i != 3) { fprintf(stderr, "Bad dependency line: %s\n", line); @@ -192,10 +224,17 @@ for (flags = 0; flags < 6; flags++) if (!strcmp(sp[1], flagtabnum[flags])) break; - if (flags == 7) + if (flags == 6) { - fprintf(stderr, "Unknown relation '%s'\n", sp[1]); - exit(1); + if ( !strcmp(sp[1], "==")) + { + flags = 1; + } + else + { + fprintf(stderr, "Unknown relation '%s'\n", sp[1]); + exit(1); + } } id = rel2id(pool, id, evrid, flags + 1, 1); } @@ -348,7 +387,7 @@ static void XMLCALL startElement(void *userData, const char *name, const char **atts) { - fprintf(stderr,"+tag: %s\n", name); + //fprintf(stderr,"+tag: %s\n", name); struct parsedata *pd = userData; Pool *pool = pd->common.pool; Solvable *s = pd->solvable; @@ -365,9 +404,9 @@ break; if (sw->from != pd->state) { -//#if 0 +#if 0 fprintf(stderr, "into unknown: %s\n", name); -//#endif +#endif return; } pd->state = sw->to; @@ -410,75 +449,82 @@ case STATE_VERSION: s->evr = makeevr_atts(pool, pd, atts); break; + case STATE_CAPS_PROVIDES: case STATE_PROVIDES: s->provides = 0; break; case STATE_PROVIDESENTRY: s->provides = adddep(pool, pd, s->provides, atts, 0); break; + case STATE_CAPS_REQUIRES: case STATE_REQUIRES: s->requires = 0; break; case STATE_REQUIRESENTRY: s->requires = adddep(pool, pd, s->requires, atts, 1); break; + case STATE_CAPS_OBSOLETES: case STATE_OBSOLETES: s->obsoletes = 0; break; case STATE_OBSOLETESENTRY: s->obsoletes = adddep(pool, pd, s->obsoletes, atts, 0); break; + case STATE_CAPS_CONFLICTS: case STATE_CONFLICTS: s->conflicts = 0; break; case STATE_CONFLICTSENTRY: s->conflicts = adddep(pool, pd, s->conflicts, atts, 0); break; + case STATE_CAPS_RECOMMENDS: case STATE_RECOMMENDS: s->recommends = 0; break; case STATE_RECOMMENDSENTRY: s->recommends = adddep(pool, pd, s->recommends, atts, 0); break; + case STATE_CAPS_SUPPLEMENTS: case STATE_SUPPLEMENTS: s->supplements= 0; break; case STATE_SUPPLEMENTSENTRY: s->supplements = adddep(pool, pd, s->supplements, atts, 0); break; + case STATE_CAPS_SUGGESTS: case STATE_SUGGESTS: s->suggests = 0; break; case STATE_SUGGESTSENTRY: s->suggests = adddep(pool, pd, s->suggests, atts, 0); break; + case STATE_CAPS_ENHANCES: case STATE_ENHANCES: s->enhances = 0; break; case STATE_ENHANCESENTRY: s->enhances = adddep(pool, pd, s->enhances, atts, 0); break; + case STATE_CAPS_FRESHENS: case STATE_FRESHENS: s->freshens = 0; break; case STATE_FRESHENSENTRY: s->freshens = adddep(pool, pd, s->freshens, atts, 0); break; - case STATE_PROVIDESCAP: - case STATE_REQUIRESCAP: - case STATE_OBSOLETESCAP: - case STATE_CONFLICTSCAP: - case STATE_RECOMMENDSCAP: - case STATE_SUPPLEMENTSCAP: - case STATE_SUGGESTSCAP: - case STATE_ENHANCESCAP: - case STATE_FRESHENSCAP: + case STATE_CAP_PROVIDES: + case STATE_CAP_REQUIRES: + case STATE_CAP_OBSOLETES: + case STATE_CAP_CONFLICTS: + case STATE_CAP_RECOMMENDS: + case STATE_CAP_SUPPLEMENTS: + case STATE_CAP_SUGGESTS: + case STATE_CAP_ENHANCES: + case STATE_CAP_FRESHENS: pd->capkind = find_attr("kind", atts); //fprintf(stderr,"capkind es: %s\n", pd->capkind); break; case STATE_SUMMARY: - pd->lang = find_attr("lang", atts); - break; case STATE_DESCRIPTION: pd->lang = find_attr("lang", atts); break; @@ -490,7 +536,7 @@ static void XMLCALL endElement(void *userData, const char *name) { - fprintf(stderr,"-tag: %s\n", name); + //fprintf(stderr,"-tag: %s\n", name); struct parsedata *pd = userData; Pool *pool = pd->common.pool; Solvable *s = pd->solvable; @@ -538,32 +584,33 @@ id = str2id(pool, pd->content, 1); s->provides = repo_addid(repo, s->provides, id); break; - case STATE_PROVIDESCAP: - s->provides = adddepplain(pool, &pd->common, s->provides, pd->content, 0, 0); + // xml store capabilities + case STATE_CAP_PROVIDES: + s->provides = adddepplain(pool, &pd->common, s->provides, pd->content, 0, pd->capkind); break; - case STATE_REQUIRESCAP: - s->requires = adddepplain(pool, &pd->common, s->requires, pd->content, 0, 0); + case STATE_CAP_REQUIRES: + s->requires = adddepplain(pool, &pd->common, s->requires, pd->content, 0, pd->capkind); break; - case STATE_OBSOLETESCAP: - s->obsoletes = adddepplain(pool, &pd->common, s->obsoletes, pd->content, 0, 0); + case STATE_CAP_OBSOLETES: + s->obsoletes = adddepplain(pool, &pd->common, s->obsoletes, pd->content, 0, pd->capkind); break; - case STATE_CONFLICTSCAP: - s->conflicts = adddepplain(pool, &pd->common, s->conflicts, pd->content, 0, 0); + case STATE_CAP_CONFLICTS: + s->conflicts = adddepplain(pool, &pd->common, s->conflicts, pd->content, 0, pd->capkind); break; - case STATE_RECOMMENDSCAP: - s->recommends = adddepplain(pool, &pd->common, s->recommends, pd->content, 0, 0); + case STATE_CAP_RECOMMENDS: + s->recommends = adddepplain(pool, &pd->common, s->recommends, pd->content, 0, pd->capkind); break; - case STATE_SUPPLEMENTSCAP: - s->supplements = adddepplain(pool, &pd->common, s->supplements, pd->content, 0, 0); + case STATE_CAP_SUPPLEMENTS: + s->supplements = adddepplain(pool, &pd->common, s->supplements, pd->content, 0, pd->capkind); break; - case STATE_SUGGESTSCAP: - s->suggests = adddepplain(pool, &pd->common, s->suggests, pd->content, 0, 0); + case STATE_CAP_SUGGESTS: + s->suggests = adddepplain(pool, &pd->common, s->suggests, pd->content, 0, pd->capkind); break; - case STATE_ENHANCESCAP: - s->enhances = adddepplain(pool, &pd->common, s->enhances, pd->content, 0, 0); + case STATE_CAP_ENHANCES: + s->enhances = adddepplain(pool, &pd->common, s->enhances, pd->content, 0, pd->capkind); break; - case STATE_FRESHENSCAP: - s->freshens = adddepplain(pool, &pd->common, s->freshens, pd->content, 0, 0); + case STATE_CAP_FRESHENS: + s->freshens = adddepplain(pool, &pd->common, s->freshens, pd->content, 0, pd->capkind); break; case STATE_SUMMARY: pd->lang = 0; @@ -576,7 +623,7 @@ } pd->state = pd->sbtab[pd->state]; pd->docontent = 0; - fprintf(stderr, "back from known %d %d %d\n", pd->state, pd->depth, pd->statedepth); + //fprintf(stderr, "back from known %d %d %d\n", pd->state, pd->depth, pd->statedepth); } static void XMLCALL Copied: trunk/sat-solver/tools/tools_util.h (from r8427, trunk/sat-solver/tools/repo_utils.h) URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/tools_util.h?p2… ============================================================================== --- trunk/sat-solver/tools/repo_utils.h (original) +++ trunk/sat-solver/tools/tools_util.h Thu Jan 31 18:54:12 2008 @@ -53,7 +53,7 @@ } static char * -join(struct parsedata_common *pd, char *s1, char *s2, char *s3) +join(struct parsedata_common *pd, const char *s1, const char *s2, const char *s3) { int l = 1; char *p; -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8427 - in /trunk/sat-solver/tools: repo_rpmmd.c repo_utils.h
by dmacvicar＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: dmacvicar Date: Thu Jan 31 18:54:11 2008 New Revision: 8427 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8427&view=rev Log: try to move split and join out support for more attributes of xmlstore I think I will need to use another strategy for the capability tag, the stupid state machine cant handle it Added: trunk/sat-solver/tools/repo_utils.h Modified: trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Thu Jan 31 18:54:11 2008 @@ -15,14 +15,14 @@ #include "pool.h" #include "repo.h" -#include "util.h" +#include "repo_utils.h" #include "repo_rpmmd.h" enum state { STATE_START, STATE_METADATA, - STATE_PACKAGE, + STATE_SOLVABLE, STATE_PRODUCT, STATE_PATTERN, STATE_PATCH, @@ -33,23 +33,34 @@ STATE_VENDOR, STATE_PROVIDES, STATE_PROVIDESENTRY, + STATE_PROVIDESCAP, STATE_REQUIRES, STATE_REQUIRESENTRY, + STATE_REQUIRESCAP, STATE_OBSOLETES, STATE_OBSOLETESENTRY, + STATE_OBSOLETESCAP, STATE_CONFLICTS, STATE_CONFLICTSENTRY, + STATE_CONFLICTSCAP, STATE_RECOMMENDS, STATE_RECOMMENDSENTRY, + STATE_RECOMMENDSCAP, STATE_SUPPLEMENTS, STATE_SUPPLEMENTSENTRY, + STATE_SUPPLEMENTSCAP, STATE_SUGGESTS, STATE_SUGGESTSENTRY, + STATE_SUGGESTSCAP, STATE_ENHANCES, STATE_ENHANCESENTRY, + STATE_ENHANCESCAP, STATE_FRESHENS, STATE_FRESHENSENTRY, + STATE_FRESHENSCAP, STATE_FILE, + STATE_SUMMARY, + STATE_DESCRIPTION, NUMSTATES }; @@ -62,35 +73,57 @@ }; static struct stateswitch stateswitches[] = { + + { STATE_START, "product", STATE_SOLVABLE, 0 }, + { STATE_START, "pattern", STATE_SOLVABLE, 0 }, + { STATE_START, "patch", STATE_SOLVABLE, 0 }, + { STATE_START, "metadata", STATE_METADATA, 0 }, - { STATE_METADATA, "package", STATE_PACKAGE, 0 }, - { STATE_METADATA, "product", STATE_PRODUCT, 0 }, - { STATE_METADATA, "pattern", STATE_PATTERN, 0 }, - { STATE_METADATA, "patch", STATE_PATCH, 0 }, - { STATE_PACKAGE, "name", STATE_NAME, 1 }, - { STATE_PACKAGE, "arch", STATE_ARCH, 1 }, - { STATE_PACKAGE, "version", STATE_VERSION, 0 }, - { STATE_PACKAGE, "format", STATE_FORMAT, 0 }, + { STATE_METADATA, "package", STATE_SOLVABLE, 0 }, + + { STATE_SOLVABLE, "name", STATE_NAME, 1 }, + { STATE_SOLVABLE, "arch", STATE_ARCH, 1 }, + { STATE_SOLVABLE, "version", STATE_VERSION, 0 }, + { STATE_SOLVABLE, "vendor", STATE_VENDOR, 1 }, + + { STATE_SOLVABLE, "format", STATE_FORMAT, 0 }, + + /* those are used in libzypp xml store */ + { STATE_SOLVABLE, "provides", STATE_PROVIDES, 0 }, + { STATE_SOLVABLE, "requires", STATE_REQUIRES, 0 }, + { STATE_SOLVABLE, "obsoletes", STATE_OBSOLETES , 0 }, + { STATE_SOLVABLE, "conflicts", STATE_CONFLICTS , 0 }, + { STATE_SOLVABLE, "recommends", STATE_RECOMMENDS , 0 }, + { STATE_SOLVABLE, "supplements", STATE_SUPPLEMENTS, 0 }, + { STATE_SOLVABLE, "suggests", STATE_SUGGESTS, 0 }, + { STATE_SOLVABLE, "enhances", STATE_ENHANCES, 0 }, + { STATE_SOLVABLE, "freshens", STATE_FRESHENS, 0 }, + + { STATE_PROVIDES, "capability", STATE_PROVIDESCAP, 1 }, + { STATE_REQUIRES, "capability", STATE_REQUIRESCAP, 1 }, + { STATE_OBSOLETES, "capability", STATE_OBSOLETESCAP, 1 }, + { STATE_CONFLICTS, "capability", STATE_CONFLICTSCAP, 1 }, + { STATE_RECOMMENDS, "capability", STATE_RECOMMENDSCAP, 1 }, + { STATE_SUPPLEMENTS, "capability", STATE_SUPPLEMENTSCAP, 1 }, + { STATE_SUGGESTS, "capability", STATE_SUGGESTSCAP, 1 }, + { STATE_ENHANCES, "capability", STATE_ENHANCESCAP, 1 }, + { STATE_FRESHENS, "capability", STATE_FRESHENSCAP, 1 }, + + { STATE_SOLVABLE, "summary", STATE_SUMMARY, 1 }, + { STATE_SOLVABLE, "description", STATE_DESCRIPTION, 1 }, + { STATE_FORMAT, "rpm:vendor", STATE_VENDOR, 1 }, - { STATE_FORMAT, "vendor", STATE_VENDOR, 1 }, + + /* rpm-md dependencies */ { STATE_FORMAT, "rpm:provides", STATE_PROVIDES, 0 }, - { STATE_FORMAT, "provides", STATE_PROVIDES, 0 }, { STATE_FORMAT, "rpm:requires", STATE_REQUIRES, 0 }, - { STATE_FORMAT, "requires", STATE_REQUIRES, 0 }, { STATE_FORMAT, "rpm:obsoletes", STATE_OBSOLETES , 0 }, - { STATE_FORMAT, "obsoletes", STATE_OBSOLETES , 0 }, { STATE_FORMAT, "rpm:conflicts", STATE_CONFLICTS , 0 }, - { STATE_FORMAT, "conflicts", STATE_CONFLICTS , 0 }, { STATE_FORMAT, "rpm:recommends", STATE_RECOMMENDS , 0 }, - { STATE_FORMAT, "recommends", STATE_RECOMMENDS , 0 }, { STATE_FORMAT, "rpm:supplements", STATE_SUPPLEMENTS, 0 }, - { STATE_FORMAT, "supplements", STATE_SUPPLEMENTS, 0 }, { STATE_FORMAT, "rpm:suggests", STATE_SUGGESTS, 0 }, - { STATE_FORMAT, "suggests", STATE_SUGGESTS, 0 }, { STATE_FORMAT, "rpm:enhances", STATE_ENHANCES, 0 }, - { STATE_FORMAT, "enhances", STATE_ENHANCES, 0 }, { STATE_FORMAT, "rpm:freshens", STATE_FRESHENS, 0 }, - { STATE_FORMAT, "freshens", STATE_FRESHENS, 0 }, { STATE_FORMAT, "file", STATE_FILE, 1 }, { STATE_PROVIDES, "rpm:entry", STATE_PROVIDESENTRY, 0 }, { STATE_REQUIRES, "rpm:entry", STATE_REQUIRESENTRY, 0 }, @@ -105,9 +138,8 @@ }; struct parsedata { + struct parsedata_common common; char *kind; - char *tmp; - int tmpl; int depth; enum state state; int statedepth; @@ -116,53 +148,60 @@ int acontent; int docontent; int numpacks; - Pool *pool; - Repo *repo; Solvable *solvable; struct stateswitch *swtab[NUMSTATES]; enum state sbtab[NUMSTATES]; + const char *lang; + const char *capkind; }; -static char * -join(struct parsedata *pd, char *s1, char *s2, char *s3) +static char *flagtabnum[] = { + ">", + "=", + ">=", + "<", + "!=", + "<=", + "==" +}; + +/** + * adds plain dependencies, that is strings like "foo > 2.0" + * which are used in libzypp xml store, not in rpm-md. + */ +static unsigned int +adddepplain(Pool *pool, struct parsedata_common *pd, unsigned int olddeps, char *line, Id marker, char *kind) { - int l = 1; - char *p; + int i, flags; + Id id, evrid; + char *sp[4]; - if (s1) - l += strlen(s1); - if (s2) - l += strlen(s2); - if (s3) - l += strlen(s3); - if (l > pd->tmpl) - { - pd->tmpl = l + 256; - if (!pd->tmp) - pd->tmp = malloc(pd->tmpl); - else - pd->tmp = realloc(pd->tmp, pd->tmpl); - } - p = pd->tmp; - if (s1) - { - strcpy(p, s1); - p += strlen(s1); - } - if (s2) + i = split(line + 5, sp, 4); + if (i != 1 && i != 3) { - strcpy(p, s2); - p += strlen(s2); + fprintf(stderr, "Bad dependency line: %s\n", line); + exit(1); } - if (s3) + if (kind) + id = str2id(pool, join(pd, kind, ":", sp[0]), 1); + else + id = str2id(pool, sp[0], 1); + if (i == 3) { - strcpy(p, s3); - p += strlen(s3); + evrid = makeevr(pool, sp[2]); + for (flags = 0; flags < 6; flags++) + if (!strcmp(sp[1], flagtabnum[flags])) + break; + if (flags == 7) + { + fprintf(stderr, "Unknown relation '%s'\n", sp[1]); + exit(1); + } + id = rel2id(pool, id, evrid, flags + 1, 1); } - return pd->tmp; + return repo_addid_dep(pd->repo, olddeps, id, marker); } - static Id makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) { @@ -228,6 +267,19 @@ return str2id(pool, pd->content, 1); } +static const char * +find_attr(const char *txt, const char **atts) +{ + char *k; + k = 0; + for (; *atts; atts += 2) + { + if (!strcmp(*atts, txt)) + return atts[1]; + } + return k; +} + static char *flagtab[] = { "GT", "EQ", @@ -289,15 +341,16 @@ #if 0 fprintf(stderr, "new dep %s%s%s\n", id2str(pool, d), id2rel(pool, d), id2evr(pool, d)); #endif - return repo_addid_dep(pd->repo, olddeps, id, marker); + return repo_addid_dep(pd->common.repo, olddeps, id, marker); } static void XMLCALL startElement(void *userData, const char *name, const char **atts) { + fprintf(stderr,"+tag: %s\n", name); struct parsedata *pd = userData; - Pool *pool = pd->pool; + Pool *pool = pd->common.pool; Solvable *s = pd->solvable; struct stateswitch *sw; @@ -312,9 +365,9 @@ break; if (sw->from != pd->state) { -#if 0 +//#if 0 fprintf(stderr, "into unknown: %s\n", name); -#endif +//#endif return; } pd->state = sw->to; @@ -335,13 +388,21 @@ #if 0 fprintf(stderr, "numpacks: %d\n", pd->numpacks); #endif - pd->solvable = pool_id2solvable(pool, repo_add_solvable_block(pd->repo, pd->numpacks)); + pd->solvable = pool_id2solvable(pool, repo_add_solvable_block(pd->common.repo, pd->numpacks)); } } break; - case STATE_PACKAGE: + case STATE_SOLVABLE: + pd->kind = 0; + if ( name[2] == 't' && name[3] == 't' ) + pd->kind = "pattern"; + else if ( name[1] == 'r' ) + pd->kind = "product"; + else if ( name[2] == 't' && name[3] == 'c' ) + pd->kind = "patch"; + if (pd->numpacks == 0) - pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->repo)); + pd->solvable = pool_id2solvable(pool, repo_add_solvable(pd->common.repo)); #if 0 fprintf(stderr, "package #%d\n", pd->solvable - pool->solvables); #endif @@ -403,6 +464,24 @@ case STATE_FRESHENSENTRY: s->freshens = adddep(pool, pd, s->freshens, atts, 0); break; + case STATE_PROVIDESCAP: + case STATE_REQUIRESCAP: + case STATE_OBSOLETESCAP: + case STATE_CONFLICTSCAP: + case STATE_RECOMMENDSCAP: + case STATE_SUPPLEMENTSCAP: + case STATE_SUGGESTSCAP: + case STATE_ENHANCESCAP: + case STATE_FRESHENSCAP: + pd->capkind = find_attr("kind", atts); + //fprintf(stderr,"capkind es: %s\n", pd->capkind); + break; + case STATE_SUMMARY: + pd->lang = find_attr("lang", atts); + break; + case STATE_DESCRIPTION: + pd->lang = find_attr("lang", atts); + break; default: break; } @@ -411,9 +490,11 @@ static void XMLCALL endElement(void *userData, const char *name) { + fprintf(stderr,"-tag: %s\n", name); struct parsedata *pd = userData; - Pool *pool = pd->pool; + Pool *pool = pd->common.pool; Solvable *s = pd->solvable; + Repo *repo = pd->common.repo; Id id; if (pd->depth != pd->statedepth) @@ -428,33 +509,24 @@ { case STATE_PATTERN: case STATE_PRODUCT: - if ( pd->state == STATE_PATTERN ) - pd->kind = "pattern"; - if ( pd->state == STATE_PRODUCT ) - pd->kind = "product"; - case STATE_PACKAGE: + case STATE_SOLVABLE: if (!s->arch) 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->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); + s->supplements = repo_fix_legacy(repo, s->provides, s->supplements); if (pd->numpacks > 0) { pd->numpacks--; pd->solvable++; } + pd->kind = 0; break; case STATE_NAME: if ( pd->kind ) - { - s->name = str2id(pool, pd->content, 1); - s->name = str2id(pool, join(pd, pd->kind, ":", pd->content), 1); - } + s->name = str2id(pool, join(&pd->common, pd->kind, ":", pd->content), 1); else - { s->name = str2id(pool, pd->content, 1); - } - pd->kind = 0; break; case STATE_ARCH: s->arch = str2id(pool, pd->content, 1); @@ -464,14 +536,47 @@ break; case STATE_FILE: id = str2id(pool, pd->content, 1); - s->provides = repo_addid(pd->repo, s->provides, id); + s->provides = repo_addid(repo, s->provides, id); + break; + case STATE_PROVIDESCAP: + s->provides = adddepplain(pool, &pd->common, s->provides, pd->content, 0, 0); + break; + case STATE_REQUIRESCAP: + s->requires = adddepplain(pool, &pd->common, s->requires, pd->content, 0, 0); + break; + case STATE_OBSOLETESCAP: + s->obsoletes = adddepplain(pool, &pd->common, s->obsoletes, pd->content, 0, 0); + break; + case STATE_CONFLICTSCAP: + s->conflicts = adddepplain(pool, &pd->common, s->conflicts, pd->content, 0, 0); + break; + case STATE_RECOMMENDSCAP: + s->recommends = adddepplain(pool, &pd->common, s->recommends, pd->content, 0, 0); + break; + case STATE_SUPPLEMENTSCAP: + s->supplements = adddepplain(pool, &pd->common, s->supplements, pd->content, 0, 0); + break; + case STATE_SUGGESTSCAP: + s->suggests = adddepplain(pool, &pd->common, s->suggests, pd->content, 0, 0); + break; + case STATE_ENHANCESCAP: + s->enhances = adddepplain(pool, &pd->common, s->enhances, pd->content, 0, 0); + break; + case STATE_FRESHENSCAP: + s->freshens = adddepplain(pool, &pd->common, s->freshens, pd->content, 0, 0); + break; + case STATE_SUMMARY: + pd->lang = 0; + break; + case STATE_DESCRIPTION: + pd->lang = 0; break; default: break; } pd->state = pd->sbtab[pd->state]; pd->docontent = 0; - // printf("back from known %d %d %d\n", pd->state, pd->depth, pd->statedepth); + fprintf(stderr, "back from known %d %d %d\n", pd->state, pd->depth, pd->statedepth); } static void XMLCALL @@ -515,13 +620,13 @@ pd.swtab[sw->from] = sw; pd.sbtab[sw->to] = sw->from; } - pd.pool = pool; - pd.repo = repo; + pd.common.pool = pool; + pd.common.repo = repo; pd.content = sat_malloc(256); pd.acontent = 256; pd.lcontent = 0; - pd.tmp = 0; - pd.tmpl = 0; + pd.common.tmp = 0; + pd.common.tmpl = 0; pd.kind = 0; XML_Parser parser = XML_ParserCreate(NULL); XML_SetUserData(parser, &pd); Added: trunk/sat-solver/tools/repo_utils.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_utils.h?re… ============================================================================== --- trunk/sat-solver/tools/repo_utils.h (added) +++ trunk/sat-solver/tools/repo_utils.h Thu Jan 31 18:54:11 2008 @@ -0,0 +1,95 @@ + +/* + * Copyright (c) 2007, Novell Inc. + * + * This program is licensed under the BSD license, read LICENSE.BSD + * for further information + */ + +/* + * util.h + * + */ + +#ifndef SATSOLVER_TOOLS_UTIL_H +#define SATSOLVER_TOOLS_UTIL_H + +struct parsedata_common { + char *tmp; + int tmpl; + Pool *pool; + Repo *repo; +}; + +static Id +makeevr(Pool *pool, char *s) +{ + if (!strncmp(s, "0:", 2) && s[2]) + s += 2; + return str2id(pool, s, 1); +} + +/** + * split a string + */ +static int +split(char *l, char **sp, int m) +{ + int i; + for (i = 0; i < m;) + { + while (*l == ' ') + l++; + if (!*l) + break; + sp[i++] = l; + while (*l && *l != ' ') + l++; + if (!*l) + break; + *l++ = 0; + } + return i; +} + +static char * +join(struct parsedata_common *pd, char *s1, char *s2, char *s3) +{ + int l = 1; + char *p; + + if (s1) + l += strlen(s1); + if (s2) + l += strlen(s2); + if (s3) + l += strlen(s3); + if (l > pd->tmpl) + { + pd->tmpl = l + 256; + if (!pd->tmp) + pd->tmp = malloc(pd->tmpl); + else + pd->tmp = realloc(pd->tmp, pd->tmpl); + } + p = pd->tmp; + if (s1) + { + strcpy(p, s1); + p += strlen(s1); + } + if (s2) + { + strcpy(p, s2); + p += strlen(s2); + } + if (s3) + { + strcpy(p, s3); + p += strlen(s3); + } + return pd->tmp; +} + +#endif + -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8426 - /trunk/sat-solver/tools/repo_rpmmd.c
by dmacvicar＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: dmacvicar Date: Thu Jan 31 18:54:09 2008 New Revision: 8426 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8426&view=rev Log: initial support for different kinds and pattern/patch store tag names. next: add support for store type of dependencies, which are slightly different to the yum ones Modified: trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?re… ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Thu Jan 31 18:54:09 2008 @@ -23,6 +23,9 @@ STATE_START, STATE_METADATA, STATE_PACKAGE, + STATE_PRODUCT, + STATE_PATTERN, + STATE_PATCH, STATE_NAME, STATE_ARCH, STATE_VERSION, @@ -61,20 +64,33 @@ static struct stateswitch stateswitches[] = { { STATE_START, "metadata", STATE_METADATA, 0 }, { STATE_METADATA, "package", STATE_PACKAGE, 0 }, + { STATE_METADATA, "product", STATE_PRODUCT, 0 }, + { STATE_METADATA, "pattern", STATE_PATTERN, 0 }, + { STATE_METADATA, "patch", STATE_PATCH, 0 }, { STATE_PACKAGE, "name", STATE_NAME, 1 }, { STATE_PACKAGE, "arch", STATE_ARCH, 1 }, { STATE_PACKAGE, "version", STATE_VERSION, 0 }, { STATE_PACKAGE, "format", STATE_FORMAT, 0 }, { STATE_FORMAT, "rpm:vendor", STATE_VENDOR, 1 }, + { STATE_FORMAT, "vendor", STATE_VENDOR, 1 }, { STATE_FORMAT, "rpm:provides", STATE_PROVIDES, 0 }, + { STATE_FORMAT, "provides", STATE_PROVIDES, 0 }, { STATE_FORMAT, "rpm:requires", STATE_REQUIRES, 0 }, + { STATE_FORMAT, "requires", STATE_REQUIRES, 0 }, { STATE_FORMAT, "rpm:obsoletes", STATE_OBSOLETES , 0 }, + { STATE_FORMAT, "obsoletes", STATE_OBSOLETES , 0 }, { STATE_FORMAT, "rpm:conflicts", STATE_CONFLICTS , 0 }, - { STATE_FORMAT, "rpm:recommends" , STATE_RECOMMENDS , 0 }, + { STATE_FORMAT, "conflicts", STATE_CONFLICTS , 0 }, + { STATE_FORMAT, "rpm:recommends", STATE_RECOMMENDS , 0 }, + { STATE_FORMAT, "recommends", STATE_RECOMMENDS , 0 }, { STATE_FORMAT, "rpm:supplements", STATE_SUPPLEMENTS, 0 }, + { STATE_FORMAT, "supplements", STATE_SUPPLEMENTS, 0 }, { STATE_FORMAT, "rpm:suggests", STATE_SUGGESTS, 0 }, + { STATE_FORMAT, "suggests", STATE_SUGGESTS, 0 }, { STATE_FORMAT, "rpm:enhances", STATE_ENHANCES, 0 }, + { STATE_FORMAT, "enhances", STATE_ENHANCES, 0 }, { STATE_FORMAT, "rpm:freshens", STATE_FRESHENS, 0 }, + { STATE_FORMAT, "freshens", STATE_FRESHENS, 0 }, { STATE_FORMAT, "file", STATE_FILE, 1 }, { STATE_PROVIDES, "rpm:entry", STATE_PROVIDESENTRY, 0 }, { STATE_REQUIRES, "rpm:entry", STATE_REQUIRESENTRY, 0 }, @@ -89,6 +105,9 @@ }; struct parsedata { + char *kind; + char *tmp; + int tmpl; int depth; enum state state; int statedepth; @@ -104,6 +123,46 @@ enum state sbtab[NUMSTATES]; }; +static char * +join(struct parsedata *pd, char *s1, char *s2, char *s3) +{ + int l = 1; + char *p; + + if (s1) + l += strlen(s1); + if (s2) + l += strlen(s2); + if (s3) + l += strlen(s3); + if (l > pd->tmpl) + { + pd->tmpl = l + 256; + if (!pd->tmp) + pd->tmp = malloc(pd->tmpl); + else + pd->tmp = realloc(pd->tmp, pd->tmpl); + } + p = pd->tmp; + if (s1) + { + strcpy(p, s1); + p += strlen(s1); + } + if (s2) + { + strcpy(p, s2); + p += strlen(s2); + } + if (s3) + { + strcpy(p, s3); + p += strlen(s3); + } + return pd->tmp; +} + + static Id makeevr_atts(Pool *pool, struct parsedata *pd, const char **atts) { @@ -367,6 +426,12 @@ pd->statedepth--; switch (pd->state) { + case STATE_PATTERN: + case STATE_PRODUCT: + if ( pd->state == STATE_PATTERN ) + pd->kind = "pattern"; + if ( pd->state == STATE_PRODUCT ) + pd->kind = "product"; case STATE_PACKAGE: if (!s->arch) s->arch = ARCH_NOARCH; @@ -380,7 +445,16 @@ } break; case STATE_NAME: - s->name = str2id(pool, pd->content, 1); + if ( pd->kind ) + { + s->name = str2id(pool, pd->content, 1); + s->name = str2id(pool, join(pd, pd->kind, ":", pd->content), 1); + } + else + { + s->name = str2id(pool, pd->content, 1); + } + pd->kind = 0; break; case STATE_ARCH: s->arch = str2id(pool, pd->content, 1); @@ -446,6 +520,9 @@ pd.content = sat_malloc(256); pd.acontent = 256; pd.lcontent = 0; + pd.tmp = 0; + pd.tmpl = 0; + pd.kind = 0; XML_Parser parser = XML_ParserCreate(NULL); XML_SetUserData(parser, &pd); XML_SetElementHandler(parser, startElement, endElement); -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8425 - in /branches/tmp/ma/jump_sat/libzypp/tests/zypp: CMakeLists.txt Vendor2.cc data/Vendor/vendors.d/ati data/Vendor/vendors.d/nvidia data/Vendor/zypp2.conf
by schubi2＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: schubi2 Date: Thu Jan 31 16:45:13 2008 New Revision: 8425 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8425&view=rev Log: add additional testcase for vendors Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor2.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/ati branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/nvidia branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp2.conf Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt Thu Jan 31 16:45:13 2008 @@ -68,6 +68,9 @@ ADD_EXECUTABLE(Vendor1 Vendor1.cc) TARGET_LINK_LIBRARIES(Vendor1 zypp boost_unit_test_framework ) +ADD_EXECUTABLE(Vendor2 Vendor2.cc) +TARGET_LINK_LIBRARIES(Vendor2 zypp boost_unit_test_framework ) + ADD_TEST(ArchTest ${CMAKE_CURRENT_BINARY_DIR}/Arch) ADD_TEST(UrlTest ${CMAKE_CURRENT_BINARY_DIR}/Url) ADD_TEST(Edition ${CMAKE_CURRENT_BINARY_DIR}/Edition) @@ -87,3 +90,4 @@ ADD_TEST(FetcherTest ${CMAKE_CURRENT_BINARY_DIR}/Fetcher) ADD_TEST(ProgressData_test ${CMAKE_CURRENT_BINARY_DIR}/ProgressData) ADD_TEST(Vendor1Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor1) +ADD_TEST(Vendor2Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor2) Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor2.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor2.cc (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor2.cc Thu Jan 31 16:45:13 2008 @@ -0,0 +1,55 @@ + +#include <iostream> +#include <list> +#include <string> + +// Boost.Test +#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/unit_test.hpp> + +using boost::unit_test::test_suite; +using boost::unit_test::test_case; +using boost::test_tools::close_at_tolerance; + +// parameterized test +// http://www.boost.org/libs/test/example/unit_test_example4.cpp + +#include "zypp/base/LogControl.h" +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" +#include "zypp/ZYpp.h" +#include "zypp/VendorAttr.h" + +using namespace std; +using namespace zypp; + + +// most frequently you implement test cases as a free functions +void vendor_test() +{ + // No vendor definition files has been readed. So only suse,opensuse vendors are + // equivalent + BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "suse") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("equal", "equal") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "SuSE") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("opensuse", "SuSE") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("open", "SuSE") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("nothing", "SuSE") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia", "SuSE") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia_new_new", "SuSE") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("nvidia", "opensuse") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "SuSE") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("ati", "nvidia") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("ati_new", "ati") ); +} + +test_suite* +init_unit_test_suite( int, char* [] ) +{ + setenv("ZYPP_CONF", "./../../tests/zypp/data/Vendor/zypp2.conf", 1 ); + zypp::base::LogControl::instance().logfile( "-" ); + test_suite* test= BOOST_TEST_SUITE( "VendorTest" ); + test->add( BOOST_TEST_CASE( &vendor_test ), 5 /* expected zero error */ , 0); + return test; +} + Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/ati URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/ati (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/ati Thu Jan 31 16:45:13 2008 @@ -0,0 +1,3 @@ +[main] + +vendors = ati,ati_new,ati_old \ No newline at end of file Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/nvidia URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/nvidia (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/nvidia Thu Jan 31 16:45:13 2008 @@ -0,0 +1,3 @@ +[main] + +vendors = nvidia,suse,old_suse \ No newline at end of file Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp2.conf URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp2.conf (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp2.conf Thu Jan 31 16:45:13 2008 @@ -0,0 +1,126 @@ +## Configuration file for software management +## /etc/zypp/zypp.conf +## +## Boolean values are 0 1 yes no on off true false + + +[main] + + +## +## Override the detected architecture +## +## Valid values: i586, i686, x86_64, ppc, ppc64, ia64, s390, s390x, .. +## Default value: Autodetected +## +## ** CAUTION: Only set if you know what you're doing ! +## ** Changing this needs a full refresh (incl. download) +## ** of all repository data. +## +# arch = s390 + + +## +## Path where the repo metadata is downloaded and kept. +## +## Valid values: A directory +## Default value: /var/cache/zypp/raw +## +## Changing this needs a full refresh (incl. download) of all repository data +## +# metadatadir = /var/cache/zypp/raw + + +## +## Path where the known repositories .repo files are kept +## +## Valid values: A directory +## Default value: /etc/zypp/repos.d +## +## Changing this invalidates all known repositories +## +# reposdir = /etc/zypp/repos.d + + +## +## Path where the processed cache is kept (this is where zypp.db is located) +## +## Valid values: A directory +## Default value: /var/cache/zypp +## +## Changing this needs a full refresh (except download) of all repository data +## +# cachedir = /var/cache/zypp + + +## +## Whether repository urls should be probed when added +## +## Valid values: boolean +## Default value: false +## +## If true, accessability of repositories is checked immediately (when added) +## (e.g. 'zypper ar' will check immediately) +## If false, accessability of repositories is checked when refreshed +## (e.g. 'zypper ar' will delay the check until the next refresh) +## +# repo.add.probe = false + + +## +## Amount of time in minutes that must pass before another refresh. +## +## Valid values: Integer +## Default value: 10 +## +## If you have autorefresh enabled for a repository, it is checked for +## up-to-date metadata not more often than every <repo.refresh.delay> +## minutes. If an automatic request for refresh comes before <repo.refresh.delay> +## minutes passed since the last check, the request is ignored. +## +## A value of 0 means the repository will always be checked. To get the oposite +## effect, disable autorefresh for your repositories. +## +## This option has no effect for repositories with autorefresh disabled, nor for +## user-requested refresh. +## +# repo.refresh.delay = 10 + + +## +## Whether to consider using a .patch.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a patch rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the changed +## ones. The .patch.rpm is ready to be installed immediately after download. +## There is no further processing needed, as it is for a .delta.rpm. +## +# download.use_patchrpm = true + + +## +## Whether to consider using a .delta.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a delta rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the binary +## diff of changed ones. Recreating the rpm package on the local machine +## is an expensive operation (memory,CPU). If your network connection is +## not too slow, you benefit from disabling .delta.rpm. +## +# download.use_deltarpm = true + + +## +## Defining directory for equivalent vendors +## +## Valid values: A directory +## Default value: /etc/zypp/vondors.d +## +vendordir = ./../../tests/zypp/data/Vendor/vendors.d + -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8424 - /branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc
by schubi2＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: schubi2 Date: Thu Jan 31 16:44:22 2008 New Revision: 8424 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8424&view=rev Log: bugfix Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc Thu Jan 31 16:44:22 2008 @@ -223,7 +223,7 @@ unsigned int rhsID = 0; Vendor lhs = str::toLower (lVendor); Vendor rhs = str::toLower (rVendor); - + if ( lhs == rhs ) return true; @@ -256,8 +256,7 @@ } } } - - return( lhsID && rhsID && lhsID == lhsID ); + return( lhsID && rhsID && lhsID == rhsID ); } ///////////////////////////////////////////////////////////////// -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8423 - in /branches/tmp/ma/jump_sat/libzypp: tests/zypp/ tests/zypp/data/Vendor/ tests/zypp/data/Vendor/vendors.d/ zypp/
by schubi2＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: schubi2 Date: Thu Jan 31 14:36:14 2008 New Revision: 8423 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8423&view=rev Log: -testcase for vendors added -bugfix in zypp.config and vendor definition Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor1.cc branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/vendors.d/ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp1.conf Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc Modified: branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt (original) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/CMakeLists.txt Thu Jan 31 14:36:14 2008 @@ -65,6 +65,9 @@ ADD_EXECUTABLE( ProgressData ProgressData_test.cc ) TARGET_LINK_LIBRARIES( ProgressData zypp boost_unit_test_framework ) +ADD_EXECUTABLE(Vendor1 Vendor1.cc) +TARGET_LINK_LIBRARIES(Vendor1 zypp boost_unit_test_framework ) + ADD_TEST(ArchTest ${CMAKE_CURRENT_BINARY_DIR}/Arch) ADD_TEST(UrlTest ${CMAKE_CURRENT_BINARY_DIR}/Url) ADD_TEST(Edition ${CMAKE_CURRENT_BINARY_DIR}/Edition) @@ -83,3 +86,4 @@ ADD_TEST(RepoInfoTest ${CMAKE_CURRENT_BINARY_DIR}/RepoInfo ${CMAKE_CURRENT_SOURCE_DIR}/data/RepoInfo) ADD_TEST(FetcherTest ${CMAKE_CURRENT_BINARY_DIR}/Fetcher) ADD_TEST(ProgressData_test ${CMAKE_CURRENT_BINARY_DIR}/ProgressData) +ADD_TEST(Vendor1Test ${CMAKE_CURRENT_BINARY_DIR}/Vendor1) Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor1.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor1.cc (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/Vendor1.cc Thu Jan 31 14:36:14 2008 @@ -0,0 +1,49 @@ + +#include <iostream> +#include <list> +#include <string> + +// Boost.Test +#include <boost/test/floating_point_comparison.hpp> +#include <boost/test/unit_test.hpp> + +using boost::unit_test::test_suite; +using boost::unit_test::test_case; +using boost::test_tools::close_at_tolerance; + +// parameterized test +// http://www.boost.org/libs/test/example/unit_test_example4.cpp + +#include "zypp/base/LogControl.h" +#include "zypp/base/Logger.h" +#include "zypp/base/Exception.h" +#include "zypp/ZYpp.h" +#include "zypp/VendorAttr.h" + +using namespace std; +using namespace zypp; + + +// most frequently you implement test cases as a free functions +void vendor_test() +{ + // No vendor definition files has been readed. So only suse,opensuse vendors are + // equivalent + BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "suse") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("equal", "equal") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("suse", "SuSE") ); + BOOST_REQUIRE( VendorAttr::instance().equivalent("opensuse", "SuSE") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("open", "SuSE") ); + BOOST_REQUIRE( !VendorAttr::instance().equivalent("nothing", "SuSE") ); +} + +test_suite* +init_unit_test_suite( int, char* [] ) +{ + setenv("ZYPP_CONF", "./../../tests/zypp/data/Vendor/zypp1.conf", 1 ); + zypp::base::LogControl::instance().logfile( "-" ); + test_suite* test= BOOST_TEST_SUITE( "VendorTest" ); + test->add( BOOST_TEST_CASE( &vendor_test ), 5 /* expected zero error */ , 0); + return test; +} + Added: branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp1.conf URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/tests… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp1.conf (added) +++ branches/tmp/ma/jump_sat/libzypp/tests/zypp/data/Vendor/zypp1.conf Thu Jan 31 14:36:14 2008 @@ -0,0 +1,126 @@ +## Configuration file for software management +## /etc/zypp/zypp.conf +## +## Boolean values are 0 1 yes no on off true false + + +[main] + + +## +## Override the detected architecture +## +## Valid values: i586, i686, x86_64, ppc, ppc64, ia64, s390, s390x, .. +## Default value: Autodetected +## +## ** CAUTION: Only set if you know what you're doing ! +## ** Changing this needs a full refresh (incl. download) +## ** of all repository data. +## +# arch = s390 + + +## +## Path where the repo metadata is downloaded and kept. +## +## Valid values: A directory +## Default value: /var/cache/zypp/raw +## +## Changing this needs a full refresh (incl. download) of all repository data +## +# metadatadir = /var/cache/zypp/raw + + +## +## Path where the known repositories .repo files are kept +## +## Valid values: A directory +## Default value: /etc/zypp/repos.d +## +## Changing this invalidates all known repositories +## +# reposdir = /etc/zypp/repos.d + + +## +## Path where the processed cache is kept (this is where zypp.db is located) +## +## Valid values: A directory +## Default value: /var/cache/zypp +## +## Changing this needs a full refresh (except download) of all repository data +## +# cachedir = /var/cache/zypp + + +## +## Whether repository urls should be probed when added +## +## Valid values: boolean +## Default value: false +## +## If true, accessability of repositories is checked immediately (when added) +## (e.g. 'zypper ar' will check immediately) +## If false, accessability of repositories is checked when refreshed +## (e.g. 'zypper ar' will delay the check until the next refresh) +## +# repo.add.probe = false + + +## +## Amount of time in minutes that must pass before another refresh. +## +## Valid values: Integer +## Default value: 10 +## +## If you have autorefresh enabled for a repository, it is checked for +## up-to-date metadata not more often than every <repo.refresh.delay> +## minutes. If an automatic request for refresh comes before <repo.refresh.delay> +## minutes passed since the last check, the request is ignored. +## +## A value of 0 means the repository will always be checked. To get the oposite +## effect, disable autorefresh for your repositories. +## +## This option has no effect for repositories with autorefresh disabled, nor for +## user-requested refresh. +## +# repo.refresh.delay = 10 + + +## +## Whether to consider using a .patch.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a patch rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the changed +## ones. The .patch.rpm is ready to be installed immediately after download. +## There is no further processing needed, as it is for a .delta.rpm. +## +# download.use_patchrpm = true + + +## +## Whether to consider using a .delta.rpm when downloading a package +## +## Valid values: boolean +## Default value: true +## +## Using a delta rpm will decrease the download size for package updates +## since it does not contain all files of the package but only the binary +## diff of changed ones. Recreating the rpm package on the local machine +## is an expensive operation (memory,CPU). If your network connection is +## not too slow, you benefit from disabling .delta.rpm. +## +# download.use_deltarpm = true + + +## +## Defining directory for equivalent vendors +## +## Valid values: A directory +## Default value: /etc/zypp/vondors.d +## +vendordir = data/Vendor/notExist + Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.cc Thu Jan 31 14:36:14 2008 @@ -107,7 +107,7 @@ VendorAttr::VendorAttr () { vendorGroupCounter = 1; - + Pathname xxx = ZConfig::instance().repoCachePath(); Pathname vendorPath (ZConfig::instance().vendorPath()); try { @@ -126,18 +126,24 @@ //checking if suse,opensuse has been defined. If not create entries if (_vendorMap.find("suse") != _vendorMap.end()) { if (_vendorMap.find("opensuse") == _vendorMap.end()) { - _vendorMap["opensuse"] = ++vendorGroupCounter; + _vendorMap["opensuse"] = vendorGroupCounter; } } else { if (_vendorMap.find("opensuse") == _vendorMap.end()) { // both are not available. Create one group with suse,opensuse - _vendorMap["opensuse"] = ++vendorGroupCounter; + _vendorMap["opensuse"] = vendorGroupCounter; _vendorMap["suse"] = vendorGroupCounter; } else { - _vendorMap["suse"] = ++vendorGroupCounter; + _vendorMap["suse"] = vendorGroupCounter; } } - + + MIL << "Equivalent vendors:" << endl; + for (VendorMap::iterator it = _vendorMap.begin(); + it != _vendorMap.end(); + it ++) { + MIL << " " << it->first << " (group " << it->second << ")" << endl; + } } bool VendorAttr::addVendorFile( const Pathname & filename ) const @@ -179,13 +185,6 @@ } } } - - MIL << "Equivalent vendors:" << endl; - for (VendorMap::iterator it = _vendorMap.begin(); - it != _vendorMap.end(); - it ++) { - MIL << " " << it->first << "(group " << it->second << ")" << endl; - } return true; } @@ -218,13 +217,15 @@ } - bool VendorAttr::equivalent( const Vendor & lhs, const Vendor & rhs ) const + bool VendorAttr::equivalent( const Vendor & lVendor, const Vendor & rVendor ) const { - if ( lhs == rhs ) - return true; - unsigned int lhsID = 0; unsigned int rhsID = 0; + Vendor lhs = str::toLower (lVendor); + Vendor rhs = str::toLower (rVendor); + + if ( lhs == rhs ) + return true; if (_matchMap.find(lhs) != _matchMap.end()) { lhsID = _matchMap[lhs]; @@ -255,8 +256,8 @@ } } } - - return( lhsID == lhsID ); + + return( lhsID && rhsID && lhsID == lhsID ); } ///////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/VendorAttr.h Thu Jan 31 14:36:14 2008 @@ -44,7 +44,7 @@ * equivalent vendor when updating. Replacing a package with one of a * different vendor usually must be confirmed by the user. */ - bool equivalent( const Vendor & lhs, const Vendor & rhs ) const; + bool equivalent( const Vendor & lVendor, const Vendor & rVendor ) const; private: VendorAttr(); Modified: branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/ZConfig.cc Thu Jan 31 14:36:14 2008 @@ -51,6 +51,7 @@ // ZYPP_CONF might override /etc/zypp/zypp.conf const char *env_confpath = getenv( "ZYPP_CONF" ); + Pathname confpath( env_confpath ? env_confpath : "/etc/zypp/zypp.conf" ); if ( PathInfo(confpath).isExist()) { @@ -106,19 +107,17 @@ { download_use_patchrpm = str::strToBool( value, download_use_patchrpm ); } - else if ( entry == "download.use_deltarpm" ) - { + else if ( entry == "download.use_deltarpm" ) + { download_use_deltarpm = str::strToBool( value, download_use_deltarpm ); - } - } - else if ( section == "vendordir" ) - { - cfg_vendor_path = Pathname(value); + } + else if ( entry == "vendordir" ) + { + cfg_vendor_path = Pathname(value); + } } - } } - } ~Impl() -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8422 - in /branches/tmp/ma/jump_sat/libzypp/zypp: Edition.cc IdString.h IdStringType.h sat/Pool.cc sat/Pool.h sat/Repo.cc sat/Repo.h sat/Solvable.cc sat/detail/PoolImpl.cc sat/detail/PoolImpl.h
by mlandres＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: mlandres Date: Thu Jan 31 14:00:43 2008 New Revision: 8422 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8422&view=rev Log: Workaround ZConfig access causing ZYppLock creation. Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Edition.cc branches/tmp/ma/jump_sat/libzypp/zypp/IdString.h branches/tmp/ma/jump_sat/libzypp/zypp/IdStringType.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.h branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h Modified: branches/tmp/ma/jump_sat/libzypp/zypp/Edition.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/Edition.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/Edition.cc Thu Jan 31 14:00:43 2008 @@ -16,7 +16,7 @@ #include "zypp/base/String.h" #include "zypp/Edition.h" -#include "zypp/sat/Pool.h" +#include "zypp/sat/detail/PoolImpl.h" /////////////////////////////////////////////////////////////////// namespace zypp @@ -113,14 +113,14 @@ int Edition::_doCompare( const char * lhs, const char * rhs ) { if ( lhs == rhs ) return 0; - if ( lhs && rhs ) return ::evrcmp_str( sat::Pool::instance().get(), lhs, rhs, EVRCMP_COMPARE ); + if ( lhs && rhs ) return ::evrcmp_str( myPool().getPool(), lhs, rhs, EVRCMP_COMPARE ); return( lhs ? 1 : -1 ); } int Edition::_doMatch( const char * lhs, const char * rhs ) { if ( lhs == rhs ) return 0; - if ( lhs && rhs ) return ::evrcmp_str( sat::Pool::instance().get(), lhs, rhs, EVRCMP_MATCH ); + if ( lhs && rhs ) return ::evrcmp_str( myPool().getPool(), lhs, rhs, EVRCMP_MATCH ); return( lhs ? 1 : -1 ); } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/IdString.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/IdString.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/IdString.h Thu Jan 31 14:00:43 2008 @@ -35,8 +35,8 @@ * While comparison differs between \ref IdString::Null and \ref IdString::Empty * ( \c NULL and \c "" ), both are represented by an empty string \c "". */ - class IdString: protected sat::detail::PoolMember, - private base::SafeBool<IdString> + class IdString : protected sat::detail::PoolMember, + private base::SafeBool<IdString> { public: /** Default ctor, empty string. */ Modified: branches/tmp/ma/jump_sat/libzypp/zypp/IdStringType.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/IdStringType.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/IdStringType.h Thu Jan 31 14:00:43 2008 @@ -82,7 +82,8 @@ * \ingroup g_CRTP */ template <class Derived> - class IdStringType : private base::SafeBool<Derived> + class IdStringType : protected sat::detail::PoolMember, + private base::SafeBool<Derived> { typedef typename base::SafeBool<Derived>::bool_type bool_type; Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.cc Thu Jan 31 14:00:43 2008 @@ -43,12 +43,12 @@ ::_Pool * Pool::get() const { return myPool().getPool(); } + Pool::size_type Pool::capacity() const + { return myPool()->nsolvables; } + const SerialNumber & Pool::serial() const { return myPool().serial(); } - void Pool::setDirty() - { return myPool().setDirty(); } - void Pool::prepare() { return myPool().prepare(); } @@ -101,7 +101,7 @@ Repo ret( reposFind( name_r ) ); if ( ret ) return ret; - return Repo( myPool().createRepo( name_r ) ); + return Repo( myPool()._createRepo( name_r ) ); } Repo Pool::reposFind( const std::string & name_r ) const @@ -136,7 +136,8 @@ */ std::ostream & operator<<( std::ostream & str, const Pool & obj ) { - return str << "sat::pool(" << obj.serial() << "){" + return str << "sat::pool(" << obj.serial() << ")[" + << obj.capacity() << "]{" << obj.reposSize() << "repos|" << obj.solvablesSize() << "slov}"; } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Pool.h Thu Jan 31 14:00:43 2008 @@ -54,13 +54,13 @@ {} public: - /** */ - const SerialNumber & serial() const; + /** Internal array size for stats only. */ + size_type capacity() const; - /** Invalidate housekeeping data (e.g. whatprovides). */ - void setDirty(); + /** Housekeeping data serial number. */ + const SerialNumber & serial() const; - /** Update housekeeping data (e.g. whatprovides). */ + /** Update housekeeping data if necessary (e.g. whatprovides). */ void prepare(); public: Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.cc Thu Jan 31 14:00:43 2008 @@ -55,7 +55,8 @@ std::string Repo::name() const { NO_REPO_RETURN( std::string() ); - if ( ! _repo->name ) return std::string(); + if ( ! _repo->name ) + return std::string(); return _repo->name; } @@ -93,7 +94,8 @@ void Repo::eraseFromPool() { - myPool().deleteRepo( _id ); + NO_REPO_RETURN(); + myPool()._deleteRepo( _repo ); _id = detail::noRepoId; } @@ -108,22 +110,13 @@ ZYPP_THROW( Exception( _("Can't read solv-file: ")+file_r.asString() ) ); } - myPool().setDirty(); - ::repo_add_solv( _repo, file ); - } - - detail::SolvableIdType Repo::addSolvable() - { - NO_REPO_THROW( Exception( _("Can't add solvables to norepo.") ) ); - myPool().setDirty(); - return ::repo_add_solvable( _repo ); + myPool()._addSolv( _repo, file ); } detail::SolvableIdType Repo::addSolvables( unsigned count_r ) { NO_REPO_THROW( Exception( _("Can't add solvables to norepo.") ) ); - myPool().setDirty(); - return ::repo_add_solvable_block( _repo, count_r ); + return myPool()._addSolvables( _repo, count_r ); } /****************************************************************** Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Repo.h Thu Jan 31 14:00:43 2008 @@ -84,16 +84,22 @@ struct EraseFromPool; public: + /** \name Repo content manipulating methods. + * \todo maybe a separate Repo/Solvable content manip interface + * provided by the pool. + */ + //@{ /** Load \ref Solvables from a solv-file. * \throws Exception if loading the solv-file fails. */ void addSolv( const Pathname & file_r ); - /** Add a new empt \ref Solvable to this \ref Repo. */ - detail::SolvableIdType addSolvable(); - /** Add \c count_r new empty \ref Solvable to this \ref Repo. */ detail::SolvableIdType addSolvables( unsigned count_r ); + /** \overload Add only one new \ref Solvable. */ + detail::SolvableIdType addSolvable() + { return addSolvables( 1 ); } + //@} public: /** Expert backdoor. */ Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/Solvable.cc Thu Jan 31 14:00:43 2008 @@ -211,9 +211,10 @@ { if ( ! obj ) return str << "sat::solvable()"; -#warning SWITCH TO IDENT INSTEAD OF KIND:NAME after tests + return str << "sat::solvable(" << obj.id() << "|" - << obj.kind() << ':' << obj.name() << '-' << obj.edition() << '.' << obj.arch() << "){" + << ( obj.isKind( ResKind::srcpackage ) ? "srcpackage:" : "" ) << obj.ident() + << '-' << obj.edition() << '.' << obj.arch() << "){" << obj.repo().name() << "}"; } Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.cc Thu Jan 31 14:00:43 2008 @@ -23,6 +23,9 @@ using std::endl; +#undef ZYPP_BASE_LOGGER_LOGGROUP +#define ZYPP_BASE_LOGGER_LOGGROUP "zypp::satpool" + // /////////////////////////////////////////////////////////////////// namespace zypp { ///////////////////////////////////////////////////////////////// @@ -86,7 +89,7 @@ ::pool_setdebugcallback( _pool, logSat, NULL ); // set pool architecture - ::pool_setarch( _pool, ZConfig::instance().systemArchitecture().asString().c_str() ); + //::pool_setarch( _pool, ZConfig::instance().systemArchitecture().asString().c_str() ); } /////////////////////////////////////////////////////////////////// @@ -99,6 +102,28 @@ ::pool_free( _pool ); } + void PoolImpl::setDirty( const char * a1, const char * a2, const char * a3 ) + { + if ( a1 ) + { + if ( a3 ) DBG << a1 << " " << a2 << " " << a3 << endl; + else if ( a2 ) DBG << a1 << " " << a2 << endl; + else DBG << a1 << endl; + } + _serial.setDirty(); + } + + void PoolImpl::prepare() + { + if ( _serial.dirty() ) + { + // sat solver claims to handle this on it's own: + ::pool_setarch( _pool, ZConfig::instance().systemArchitecture().asString().c_str() ); + ::pool_createwhatprovides( _pool ); + _serial.serial(); + } + } + ///////////////////////////////////////////////////////////////// } // namespace detail /////////////////////////////////////////////////////////////////// Modified: branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/tmp/ma/jump_sat/libzypp/zypp/… ============================================================================== --- branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h (original) +++ branches/tmp/ma/jump_sat/libzypp/zypp/sat/detail/PoolImpl.h Thu Jan 31 14:00:43 2008 @@ -58,44 +58,48 @@ const SerialNumber & serial() const { return _serial; } - /** Invalidate housekeeping data (e.g. whatprovides). - */ - void setDirty() - { _serial.setDirty(); } /** Update housekeeping data (e.g. whatprovides). * \todo actually requires a watcher. */ - void prepare() - { - if ( _serial.dirty() ) - { - // sat solver claims to handle this on it's own: - //::pool_createwhatprovides( _pool ); - _serial.serial(); - } - } + void prepare(); + + private: + /** Invalidate housekeeping data (e.g. whatprovides). + */ + void setDirty( const char * a1 = 0, const char * a2 = 0, const char * a3 = 0 ); public: /** \name Actions invalidating housekeeping data. - */ + * + * All methods expect valid arguments being passed. + */ //@{ /** Creating a new repo named \a name_r. */ - RepoIdType createRepo( const std::string & name_r ) + RepoIdType _createRepo( const std::string & name_r ) { - setDirty(); + setDirty(__FUNCTION__, name_r.c_str() ); return ::repo_create( _pool, name_r.c_str() ); } /** Creating a new repo named \a name_r. */ - void deleteRepo( RepoIdType id_r ) + void _deleteRepo( ::_Repo * repo_r ) { - ::_Repo * todel( getRepo( id_r ) ); - if ( todel ) - { - setDirty(); - ::repo_free( todel, /*reuseids*/false ); - } + setDirty(__FUNCTION__, repo_r->name ); + ::repo_free( repo_r, /*reuseids*/false ); + } + + /** Adding solv file to a repo. */ + void _addSolv( ::_Repo * repo_r, FILE * file_r ) + { + setDirty(__FUNCTION__, repo_r->name ); + ::repo_add_solv( repo_r , file_r ); + } + /** Adding Solvables to a repo. */ + detail::SolvableIdType _addSolvables( ::_Repo * repo_r, unsigned count_r ) + { + setDirty(__FUNCTION__, repo_r->name ); + return ::repo_add_solvable_block( repo_r, count_r ); } //@} @@ -155,6 +159,7 @@ ::_Pool * _pool; /** Serial number. */ SerialNumber _serial; + }; /////////////////////////////////////////////////////////////////// @@ -167,4 +172,5 @@ ///////////////////////////////////////////////////////////////// } // namespace zypp /////////////////////////////////////////////////////////////////// +#define POOL_SETDIRTY #endif // ZYPP_SAT_DETAIL_POOLIMPL_H -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8421 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: jkupec Date: Thu Jan 31 13:41:40 2008 New Revision: 8421 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8421&view=rev Log: - fixed shell -h in zypper shell Modified: trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8421&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jan 31 13:41:40 2008 @@ -515,8 +515,6 @@ setCommand(ZypperCommand(command_str)); if (command() == ZypperCommand::SHELL_QUIT) break; - else if (command() == ZypperCommand::SHELL) - cout << _("You already are running zypper's shell.") << endl; else if (command() == ZypperCommand::NONE) print_unknown_command_hint(*this); else @@ -2301,11 +2299,15 @@ else if (command() == ZypperCommand::SHELL) { - if (!runningHelp()) - WAR << "this command should not be reached when not running help." - " Printing the help anyway." << endl; - - cout << _command_help; + if (runningHelp()) + cout << _command_help; + else if (runningShell()) + cout << _("You already are running zypper's shell.") << endl; + else + { + cerr << _("Unexpected program flow") << "." << endl; + report_a_bug(cerr); + } return; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8420 - /trunk/zypper/package/zypper.changes
by jkupec＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: jkupec Date: Thu Jan 31 13:19:04 2008 New Revision: 8420 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8420&view=rev Log: changes Modified: trunk/zypper/package/zypper.changes Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?re… ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Thu Jan 31 13:19:04 2008 @@ -1,7 +1,13 @@ ------------------------------------------------------------------- +Thu Jan 31 13:17:57 CET 2008 - jkupec(a)suse.cz + +- fixed zypper help shell (bnc #357262) +- r8419 + +------------------------------------------------------------------- Thu Jan 17 14:22:56 CET 2008 - jkupec(a)suse.cz -- --dry-run for in, rm, up, and dup (#350736) +- --dry-run for in, rm, up, and dup (bnc #350736) - r8306:8311 ------------------------------------------------------------------- -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0

[zypp-commit] r8419 - /trunk/zypper/src/zypper.cc
by jkupec＠svn.opensuse.org 31 Jan '08

31 Jan '08

Author: jkupec Date: Thu Jan 31 13:17:51 2008 New Revision: 8419 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8419&view=rev Log: - fixed zypper help shell (bnc #357262) Modified: trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8419&r1… ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jan 31 13:17:51 2008 @@ -92,6 +92,12 @@ MIL << "Caught exit request:" << endl << e.msg() << endl; return exitCode(); } + + if (runningHelp()) + { + safeDoCommand(); + return exitCode(); + } switch(command().toEnum()) { @@ -101,12 +107,7 @@ return exitCode(); case ZypperCommand::NONE_e: - { - if (runningHelp()) - return ZYPPER_EXIT_OK; - else - return ZYPPER_EXIT_ERR_SYNTAX; - } + return ZYPPER_EXIT_ERR_SYNTAX; default: safeDoCommand(); @@ -410,6 +411,21 @@ setExitCode(ZYPPER_EXIT_ERR_SYNTAX); } } + else if (command() == ZypperCommand::SHELL && optind < _argc) + { + string arg = _argv[optind++]; + if (!arg.empty()) + { + if (arg == "-h" || arg == "--help") + setRunningHelp(true); + else + { + report_too_many_arguments("shell\n"); + setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS); + ZYPP_THROW(ExitRequestException("help provided")); + } + } + } // additional repositories if (gopts.count("plus-repo")) @@ -1225,6 +1241,23 @@ break; } + case ZypperCommand::SHELL_e: + { + static struct option quit_options[] = { + {"help", no_argument, 0, 'h'}, + {0, 0, 0, 0} + }; + specific_options = quit_options; + _command_help = _( + "shell\n" + "\n" + "Enter the zypper command shell.\n" + "\n" + "This command has no additional options.\n" + ); + break; + } + default: { ERR << "Unknown or unexpected command" << endl; @@ -2266,6 +2299,17 @@ return; } + else if (command() == ZypperCommand::SHELL) + { + if (!runningHelp()) + WAR << "this command should not be reached when not running help." + " Printing the help anyway." << endl; + + cout << _command_help; + + return; + } + // if the program reaches this line, something went wrong setExitCode(ZYPPER_EXIT_ERR_BUG); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: zypp-commit+help(a)opensuse.org

1 0