Author: dmacvicar Date: Wed Oct 22 13:05:45 2008 New Revision: 11442 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11442&view=rev Log: add support for new tags Modified: trunk/libzypp/zypp/sat/SolvAttr.h trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_repomdxml.c Modified: trunk/libzypp/zypp/sat/SolvAttr.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/sat/SolvAttr.h?rev=11442&r1=11441&r2=11442&view=diff ============================================================================== --- trunk/libzypp/zypp/sat/SolvAttr.h (original) +++ trunk/libzypp/zypp/sat/SolvAttr.h Wed Oct 22 13:05:45 2008 @@ -148,6 +148,7 @@ static const SolvAttr repositoryUpdates; static const SolvAttr repositoryKeywords; static const SolvAttr repositoryProducts; + static const SolvAttr repositoryRevision; //@} //@} Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=11442&r1=11441&r2=11442&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Wed Oct 22 13:05:45 2008 @@ -6,6 +6,13 @@ - 0.12.0 ------------------------------------------------------------------- +Wed Oct 22 13:00:25 CEST 2008 - dmacvicar@suse.de + +- support the new standarized tags available in + createrepo > 0.9.6 + saving of the distro tag still missing. + +------------------------------------------------------------------- Thu Oct 16 00:50:47 CEST 2008 - mls@suse.de - make iterator work with completely empty repos [bnc#435838] Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=11442&r1=11441&r2=11442&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Wed Oct 22 13:05:45 2008 @@ -183,6 +183,8 @@ KNOWNID(REPOSITORY_PRODUCTS, "repository:products"), /* keyword (tags) for this repository */ KNOWNID(REPOSITORY_KEYWORDS, "repository:keywords"), +/* revision of the repository. arbitrary string */ +KNOWNID(REPOSITORY_REVISION, "repository:revision"), KNOWNID(DELTA_PACKAGE_NAME, "delta:pkgname"), KNOWNID(DELTA_PACKAGE_EVR, "delta:pkgevr"), Modified: trunk/sat-solver/tools/repo_repomdxml.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_repomdxml.c?rev=11442&r1=11441&r2=11442&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_repomdxml.c (original) +++ trunk/sat-solver/tools/repo_repomdxml.c Wed Oct 22 13:05:45 2008 @@ -24,42 +24,53 @@ /* <repomd> -<data type="primary"> -<location href="repodata/primary.xml.gz"/> -<checksum type="sha">e9162516fa25fec8d60caaf4682d2e49967786cc</checksum> -<timestamp>1215708444</timestamp> -<open-checksum type="sha">c796c48184cd5abc260e4ba929bdf01be14778a7</open-checksum> -</data> -<data type="filelists"> -<location href="repodata/filelists.xml.gz"/> -<checksum type="sha">1c638295c49e9707c22810004ebb0799791fcf45</checksum> -<timestamp>1215708445</timestamp> -<open-checksum type="sha">54a40d5db3df0813b8acbe58cea616987eb9dc16</open-checksum> -</data> -<data type="other"> -<location href="repodata/other.xml.gz"/> -<checksum type="sha">a81ef39eaa70e56048f8351055119d8c82af2491</checksum> -<timestamp>1215708447</timestamp> -<open-checksum type="sha">4d1ee867c8864025575a2fb8fde3b85371d51978</open-checksum> -</data> -<data type="deltainfo"> -<location href="repodata/deltainfo.xml.gz"/> -<checksum type="sha">5880cfa5187026a24a552d3c0650904a44908c28</checksum> -<timestamp>1215708447</timestamp> -<open-checksum type="sha">7c964a2c3b17df5bfdd962c3be952c9ca6978d8b</open-checksum> -</data> -<data type="updateinfo"> -<location href="repodata/updateinfo.xml.gz"/> -<checksum type="sha">4097f7e25c7bb0770ae31b2471a9c8c077ee904b</checksum> -<timestamp>1215708447</timestamp> -<open-checksum type="sha">24f8252f3dd041e37e7c3feb2d57e02b4422d316</open-checksum> -</data> -<data type="diskusage"> -<location href="repodata/diskusage.xml.gz"/> -<checksum type="sha">4097f7e25c7bb0770ae31b2471a9c8c077ee904b</checksum> -<timestamp>1215708447</timestamp> -<open-checksum type="sha">24f8252f3dd041e37e7c3feb2d57e02b4422d316</open-checksum> -</data> + + <!-- these tags are available in create repo > 0.9.6 --> + <revision>timestamp_or_arbitrary_user_supplied_string</revision> + <tags> + <content>opensuse</content> + <content>i386</content> + <content>other string</content> + <distro cpeid="cpe://o:opensuse_project:opensuse:11">openSUSE 11.0</distro> + </tags> + <!-- end --> + + <data type="primary"> + <location href="repodata/primary.xml.gz"/> + <checksum type="sha">e9162516fa25fec8d60caaf4682d2e49967786cc</checksum> + <timestamp>1215708444</timestamp> + <open-checksum type="sha">c796c48184cd5abc260e4ba929bdf01be14778a7</open-checksum> + </data> + <data type="filelists"> + <location href="repodata/filelists.xml.gz"/> + <checksum type="sha">1c638295c49e9707c22810004ebb0799791fcf45</checksum> + <timestamp>1215708445</timestamp> + <open-checksum type="sha">54a40d5db3df0813b8acbe58cea616987eb9dc16</open-checksum> + </data> + <data type="other"> + <location href="repodata/other.xml.gz"/> + <checksum type="sha">a81ef39eaa70e56048f8351055119d8c82af2491</checksum> + <timestamp>1215708447</timestamp> + <open-checksum type="sha">4d1ee867c8864025575a2fb8fde3b85371d51978</open-checksum> + </data> + <data type="deltainfo"> + <location href="repodata/deltainfo.xml.gz"/> + <checksum type="sha">5880cfa5187026a24a552d3c0650904a44908c28</checksum> + <timestamp>1215708447</timestamp> + <open-checksum type="sha">7c964a2c3b17df5bfdd962c3be952c9ca6978d8b</open-checksum> + </data> + <data type="updateinfo"> + <location href="repodata/updateinfo.xml.gz"/> + <checksum type="sha">4097f7e25c7bb0770ae31b2471a9c8c077ee904b</checksum> + <timestamp>1215708447</timestamp> + <open-checksum type="sha">24f8252f3dd041e37e7c3feb2d57e02b4422d316</open-checksum> + </data> + <data type="diskusage"> + <location href="repodata/diskusage.xml.gz"/> + <checksum type="sha">4097f7e25c7bb0770ae31b2471a9c8c077ee904b</checksum> + <timestamp>1215708447</timestamp> + <open-checksum type="sha">24f8252f3dd041e37e7c3feb2d57e02b4422d316</open-checksum> + </data> </repomd> support also extension suseinfo format @@ -86,6 +97,10 @@ STATE_KEYWORD, /* normal repomd.xml */ STATE_REPOMD, + STATE_REVISION, + STATE_TAGS, + STATE_CONTENT, + STATE_DISTRO, STATE_DATA, STATE_LOCATION, STATE_CHECKSUM, @@ -109,10 +124,19 @@ { STATE_SUSEINFO, "expire", STATE_EXPIRE, 1 }, { STATE_SUSEINFO, "products", STATE_PRODUCTS, 0 }, { STATE_SUSEINFO, "keywords", STATE_KEYWORDS, 0 }, - { STATE_PRODUCTS, "id", STATE_PRODUCT, 1 }, + { STATE_PRODUCTS, "id", STATE_PRODUCT, 1 }, + /* keywords is the suse extension equivalent of + tags/content when this one was not yet available. + therefore we parse both */ { STATE_KEYWORDS, "k", STATE_KEYWORD, 1 }, /* standard tags */ + { STATE_REPOMD, "revision", STATE_REVISION, 1 }, + { STATE_REPOMD, "tags", STATE_TAGS, 0 }, { STATE_REPOMD, "data", STATE_DATA, 0 }, + + { STATE_TAGS, "content", STATE_CONTENT, 1 }, + { STATE_TAGS, "distro", STATE_DISTRO, 1 }, + { STATE_DATA, "location", STATE_LOCATION, 0 }, { STATE_DATA, "checksum", STATE_CHECKSUM, 1 }, { STATE_DATA, "timestamp", STATE_TIMESTAMP, 1 }, @@ -223,6 +247,9 @@ case STATE_PRODUCT: break; case STATE_KEYWORDS: break; case STATE_KEYWORD: break; + case STATE_CONTENT: break; + case STATE_REVISION: break; + case STATE_DISTRO: break; case STATE_DATA: break; case STATE_LOCATION: break; case STATE_CHECKSUM: break; @@ -288,10 +315,17 @@ if (pd->content) repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_PRODUCTS, pd->content); break; + /* repomd.xml content and suseinfo.xml keywords are equivalent */ + case STATE_CONTENT: case STATE_KEYWORD: if (pd->content) repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_KEYWORDS, pd->content); break; + case STATE_REVISION: + if (pd->content) + repodata_add_poolstr_array(pd->data, SOLVID_META, REPOSITORY_REVISION, pd->content); + break; + case STATE_DISTRO: break; case STATE_SUSEINFO: break; case STATE_PRODUCTS: break; case STATE_KEYWORDS: break; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org