From 52175516e8f45aeffa355d02982021328abcbea4 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 9 May 2008 20:00:15 +0000 Subject: [PATCH] Parse the products LABEL in content file to SUMMARY. --- package/libsatsolver.changes | 5 +++++ src/knownid.h | 2 -- tools/repo_content.c | 12 +++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/libsatsolver.changes b/package/libsatsolver.changes index 54041d4..522d793 100644 --- a/package/libsatsolver.changes +++ b/package/libsatsolver.changes @@ -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 diff --git a/src/knownid.h b/src/knownid.h index ff11633..65f4e49 100644 --- a/src/knownid.h +++ b/src/knownid.h @@ -136,8 +136,6 @@ KNOWNID(UPDATE_REFERENCE_TITLE, "update:reference:title"), /* title, e. /* 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"), diff --git a/tools/repo_content.c b/tools/repo_content.c index 0b7f846..da7a99c 100644 --- a/tools/repo_content.c +++ b/tools/repo_content.c @@ -294,14 +294,16 @@ repo_add_content(Repo *repo, FILE *fp) 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? + * : Don't think so. zypp does not use or propagate them. + */ #undef istag } else @@ -314,7 +316,7 @@ repo_add_content(Repo *repo, FILE *fp) 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); -- 2.7.4