Author: jkupec Date: Mon May 19 19:53:52 2008 New Revision: 10149 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10149&view=rev Log: - added delta target package evra parsing Modified: trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_deltainfoxml.c Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=10149&r1=10148&r2=10149&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Mon May 19 19:53:52 2008 @@ -149,6 +149,8 @@ KNOWNID(SUSETAGS_DATADIR, "susetags:datadir"), KNOWNID(DELTA_PACKAGE_NAME, "delta:pkgname"), +KNOWNID(DELTA_PACKAGE_EVR, "delta:pkgevr"), +KNOWNID(DELTA_PACKAGE_ARCH, "delta:pkgarch"), KNOWNID(DELTA_LOCATION_DIR, "delta:locdir"), KNOWNID(DELTA_LOCATION_NAME, "delta:locname"), KNOWNID(DELTA_LOCATION_EVR, "delta:locevr"), Modified: trunk/sat-solver/tools/repo_deltainfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_deltainfoxml.c?rev=10149&r1=10148&r2=10149&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_deltainfoxml.c (original) +++ trunk/sat-solver/tools/repo_deltainfoxml.c Mon May 19 19:53:52 2008 @@ -116,6 +116,7 @@ struct deltarpm delta; Id newpkgevr; Id newpkgname; + Id newpkgarch; }; /* @@ -313,11 +314,16 @@ break; case STATE_NEWPACKAGE: if ( (str = find_attr("name", atts)) ) - { + { pd->newpkgname = str2id(pool, str, 1); - } + } + pd->newpkgevr = makeevr_atts(pool, pd, atts); + if ( (str = find_attr("arch", atts)) ) + { + pd->newpkgarch = str2id(pool, str, 1); + } break; - + case STATE_DELTA: memset(&pd->delta, 0, sizeof (pd->delta)); *pd->tempstr = 0; @@ -386,6 +392,8 @@ fprintf (stderr, "found deltarpm for %s:\n", id2str(pool, pd->newpkgname)); #endif repo_set_id(pd->repo, pd->datanum, DELTA_PACKAGE_NAME, pd->newpkgname); + repo_set_id(pd->repo, pd->datanum, DELTA_PACKAGE_EVR, pd->newpkgevr); + repo_set_id(pd->repo, pd->datanum, DELTA_PACKAGE_ARCH, pd->newpkgarch); repo_set_id(pd->repo, pd->datanum, DELTA_LOCATION_NAME, d->locname); repo_set_id(pd->repo, pd->datanum, DELTA_LOCATION_DIR, d->locdir); repo_set_id(pd->repo, pd->datanum, DELTA_LOCATION_EVR, d->locevr); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org