Author: mlandres Date: Fri May 9 22:00:15 2008 New Revision: 10030 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10030&view=rev Log: Parse the products LABEL in content file to SUMMARY. Modified: trunk/sat-solver/package/libsatsolver.changes trunk/sat-solver/src/knownid.h trunk/sat-solver/tools/repo_content.c Modified: trunk/sat-solver/package/libsatsolver.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.changes?rev=10030&r1=10029&r2=10030&view=diff ============================================================================== --- trunk/sat-solver/package/libsatsolver.changes (original) +++ trunk/sat-solver/package/libsatsolver.changes Fri May 9 22:00:15 2008 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Fri May 9 21:56:43 CEST 2008 - ma@suse.de + +- Parse the products LABEL in content file to SUMMARY. + +------------------------------------------------------------------- Fri May 9 20:26:52 CEST 2008 - dmacvicar@suse.de - recognize 1 as true for reboot suggested and Modified: trunk/sat-solver/src/knownid.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/knownid.h?rev=10030&r1=10029&r2=10030&view=diff ============================================================================== --- trunk/sat-solver/src/knownid.h (original) +++ trunk/sat-solver/src/knownid.h Fri May 9 22:00:15 2008 @@ -136,8 +136,6 @@ /* name */ KNOWNID(PRODUCT_SHORTLABEL, "product:shortlabel"), -/* summary */ -KNOWNID(PRODUCT_LABEL, "product:label"), KNOWNID(PRODUCT_DISTPRODUCT, "product:distproduct"), KNOWNID(PRODUCT_DISTVERSION, "product:distversion"), KNOWNID(PRODUCT_TYPE, "product:type"), Modified: trunk/sat-solver/tools/repo_content.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_content.c?rev=10030&r1=10029&r2=10030&view=diff ============================================================================== --- trunk/sat-solver/tools/repo_content.c (original) +++ trunk/sat-solver/tools/repo_content.c Fri May 9 22:00:15 2008 @@ -294,14 +294,16 @@ add_multiple_strings(data, handle, PRODUCT_OPTIONALURLS, value); else if (istag ("SHORTLABEL")) repo_set_str(repo, s - pool->solvables, PRODUCT_SHORTLABEL, value); - else if (istag ("LABEL")) - repo_set_str(repo, s - pool->solvables, PRODUCT_LABEL, value); + else if (istag ("LABEL")) /* LABEL is the products SUMMARY. */ + repo_set_str(repo, s - pool->solvables, SOLVABLE_SUMMARY, value); else if (!strncmp (key, "LABEL.", 6)) - repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, PRODUCT_LABEL, key + 6, 1), value); + repo_set_str(repo, s - pool->solvables, pool_id2langid(pool, SOLVABLE_SUMMARY, key + 6, 1), value); else if (istag ("FLAGS")) add_multiple_strings(data, handle, PRODUCT_FLAGS, value); - /* XXX do something about LINGUAS and ARCH? */ + /* XXX do something about LINGUAS and ARCH? + * <ma>: Don't think so. zypp does not use or propagate them. + */ #undef istag } else @@ -314,7 +316,7 @@ s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0); if (s) s->supplements = repo_fix_legacy(repo, s->provides, s->supplements); - + if (pd.tmp) sat_free(pd.tmp); sat_free(line); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org