From: Duncan Mac-Vicar P <dmacvicar@suse.de>
Date: Mon, 22 Sep 2008 16:57:39 +0000 (+0000)
Subject: - refactor the repository matching with products, not yet complete
X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~180
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=85403e634c41a1e08087352c30e7b8475981b48f;p=thirdparty%2Flibsolv.git

- refactor the repository matching with products, not yet complete
- move the cpename up to resobject as it is a generic attribute
  (and can be useful to match vulnerabilities in the future)
---

diff --git a/src/knownid.h b/src/knownid.h
index ae499876..6fb3fb00 100644
--- a/src/knownid.h
+++ b/src/knownid.h
@@ -95,6 +95,7 @@ KNOWNID(SOLVABLE_LICENSE,		"solvable:license"),
 KNOWNID(SOLVABLE_BUILDTIME,		"solvable:buildtime"),
 KNOWNID(SOLVABLE_BUILDHOST,		"solvable:buildhost"),
 KNOWNID(SOLVABLE_EULA,			"solvable:eula"),
+KNOWNID(SOLVABLE_CPE_NAME,	        "solvable:cpename"),
 KNOWNID(SOLVABLE_MESSAGEINS,		"solvable:messageins"),
 KNOWNID(SOLVABLE_MESSAGEDEL,		"solvable:messagedel"),
 KNOWNID(SOLVABLE_INSTALLSIZE,		"solvable:installsize"),
@@ -158,7 +159,6 @@ KNOWNID(PRODUCT_REFERENCES,		"product:references"),
 KNOWNID(PRODUCT_UPDATEREPOKEY,		"product:updaterepokey"),
 KNOWNID(PRODUCT_REGISTER_TARGET,	"product:regtarget"),
 KNOWNID(PRODUCT_REGISTER_RELEASE,	"product:regrelease"),
-KNOWNID(PRODUCT_CPE_NAME,	        "product:cpename"),
 
 /* argh */
 KNOWNID(SUSETAGS_DATADIR,		"susetags:datadir"),
diff --git a/tools/repo_products.c b/tools/repo_products.c
index b42d6dac..022b400a 100644
--- a/tools/repo_products.c
+++ b/tools/repo_products.c
@@ -355,7 +355,7 @@ endElement(void *userData, const char *name)
     break;
     case STATE_CPENAME:
       if (pd->content)
-        repodata_set_str(pd->data, pd->handle, PRODUCT_CPE_NAME, pd->content);
+        repodata_set_str(pd->data, pd->handle, SOLVABLE_CPE_NAME, pd->content);
     default:
       break;
     }