Author: dmacvicar Date: Thu Sep 11 14:32:32 2008 New Revision: 11012 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11012&view=rev Log: update repository matching Modified: trunk/sat-solver/VERSION.cmake trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_updateinfoxml.c Modified: trunk/sat-solver/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/VERSION.cmake?rev=11012&r1=11011&r2=11012&view=diff ============================================================================== --- trunk/sat-solver/VERSION.cmake (original) +++ trunk/sat-solver/VERSION.cmake Thu Sep 11 14:32:32 2008 @@ -46,6 +46,6 @@ SET(LIBSATSOLVER_MAJOR "0") SET(LIBSATSOLVER_MINOR "10") -SET(LIBSATSOLVER_PATCH "10") +SET(LIBSATSOLVER_PATCH "11") -# last released 0.10.10 +# last released 0.10.11 Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=11012&r1=11011&r2=11012&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Thu Sep 11 14:32:32 2008 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Thu Sep 11 14:30:16 CEST 2008 - dmacvicar@suse.de + +- add REPOSITORY_UPDATES to match product -> repos +- make updateinfo.xml support id attribute in collection that + leads to insert that the repository updates that id. + - 0.10.11 + +------------------------------------------------------------------- Wed Sep 10 18:11:10 CEST 2008 - dmacvicar@suse.de - create one product per BASEARCHS Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=11012&r1=11011&r2=11012&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Thu Sep 11 14:32:32 2008 @@ -167,6 +167,8 @@ /* hint when the metadata could be outdated w/respect to generated timestamp */ KNOWNID(REPOSITORY_EXPIRE, "repository:expire"), +/* which things does this repo provides updates for, if it does */ +KNOWNID(REPOSITORY_UPDATES, "repository:updates"), KNOWNID(DELTA_PACKAGE_NAME, "delta:pkgname"), KNOWNID(DELTA_PACKAGE_EVR, "delta:pkgevr"), Modified: trunk/sat-solver/tools/repo_updateinfoxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_updateinfoxml.c?rev=11012&r1=11011&r2=11012&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_updateinfoxml.c (original) +++ trunk/sat-solver/tools/repo_updateinfoxml.c Thu Sep 11 14:32:32 2008 @@ -140,7 +140,6 @@ * find attribute */ -/* static const char * find_attr(const char *txt, const char **atts) { @@ -151,8 +150,6 @@ } return 0; } -*/ - /* * create evr (as Id) from 'epoch', 'version' and 'release' attributes @@ -363,9 +360,15 @@ break; case STATE_PKGLIST: break; - /* <collection short="F8"> */ + /* <collection short="F8" id="PRODUCT0001444"> */ case STATE_COLLECTION: - break; + { + /* insert a REPOSITORY_UPDATES for every present collection id */ + const char *cid; + if ((cid = find_attr("id", atts))) + repodata_add_poolstr_array(pd->data, -1, REPOSITORY_UPDATES, cid); + break; + } /* <name>Fedora 8</name> */ case STATE_NAME: break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org