Author: dmacvicar Date: Thu Sep 25 13:54:52 2008 New Revision: 11161 URL: http://svn.opensuse.org/viewcvs/zypp?rev=11161&view=rev Log: support keywords in susedata Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/tools/repo_rpmmd.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.c... ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Thu Sep 25 13:54:52 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Sep 25 13:53:54 CEST 2008 - dmacvicar@suse.de + +- add support for keywords in susedata + +------------------------------------------------------------------- Wed Sep 24 10:55:01 CEST 2008 - kkaempf@suse.de - parse /etc/<xyz>-release if no /etc/products.d present Modified: trunk/sat-solver/tools/repo_rpmmd.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmmd.c?rev... ============================================================================== --- trunk/sat-solver/tools/repo_rpmmd.c (original) +++ trunk/sat-solver/tools/repo_rpmmd.c Thu Sep 25 13:54:52 2008 @@ -52,6 +52,8 @@ /* Novell/SUSE extended attributes */ STATE_EULA, + STATE_KEYWORDS, + STATE_KEYWORD, STATE_DISKUSAGE, STATE_DIRS, STATE_DIR, @@ -161,6 +163,7 @@ /* extended Novell/SUSE attributes (susedata.xml) */ { STATE_SOLVABLE, "eula", STATE_EULA, 1 }, + { STATE_SOLVABLE, "keywords", STATE_KEYWORDS, 0 }, { STATE_SOLVABLE, "diskusage", STATE_DISKUSAGE, 0 }, // pattern attribute @@ -199,6 +202,7 @@ { STATE_SOLVABLE, "file", STATE_FILE, 1 }, /* extended Novell/SUSE dskusage attributes (suseinfo.xml) */ + { STATE_KEYWORDS, "k", STATE_KEYWORD, 1 }, { STATE_DISKUSAGE, "dirs", STATE_DIRS, 0 }, { STATE_DIRS, "dir", STATE_DIR, 0 }, @@ -1049,6 +1053,10 @@ if (pd->content[0]) repodata_set_str(pd->data, handle, langtag(pd, SOLVABLE_EULA, pd->language), pd->content); break; + case STATE_KEYWORD: + if (pd->content[0]) + repodata_add_poolstr_array(pd->data, pd->handle, SOLVABLE_KEYWORDS, pd->content); + break; case STATE_DISKUSAGE: if (pd->ndirs) commit_diskusage (pd, pd->handle); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org